diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2017-05-11 13:52:18 -0700 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2017-05-11 13:52:43 -0700 |
| commit | f03fe600ead457751fd6b456c2ca7f73b5d8e3d0 (patch) | |
| tree | 16990f43a0371b3d46e8fc7d35070a9faf1b97fc | |
| parent | cbb7946eb39b3ac6c0b60b6b30dd63178594300e (diff) | |
| download | libcups-f03fe600ead457751fd6b456c2ca7f73b5d8e3d0.tar.gz | |
Store version in file, not a git tag.
Bug: 38203442
Test: update_libcups
Change-Id: I4432c0e42db5c6e243ff40cc5ab7502c5e5e7f88
Merged-In: I4432c0e42db5c6e243ff40cc5ab7502c5e5e7f88
| -rw-r--r-- | libcups_version | 1 | ||||
| -rwxr-xr-x | update_libcups.sh | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libcups_version b/libcups_version new file mode 100644 index 00000000..7fe52d36 --- /dev/null +++ b/libcups_version @@ -0,0 +1 @@ +v2.2.1 diff --git a/update_libcups.sh b/update_libcups.sh index 8afbdce7..34592d6b 100755 --- a/update_libcups.sh +++ b/update_libcups.sh @@ -14,7 +14,7 @@ echo echo "== get current rev ==" cd $TARGET_DIR -CURRENT_REV=$(git tag -l | grep -v "release" | grep -v "b" | grep -v "rc" | sort | tail -n1) +CURRENT_REV=$(cat libcups_version) echo "Current rev is $CURRENT_REV" echo @@ -56,16 +56,15 @@ else sed -i -e "s/^\(#.*CUPS_SVERSION\).*/\1 \"CUPS $NEW_REV\"/g" config.h sed -i -e "s:^\(#.*CUPS_MINIMAL\).*:\1 \"CUPS/${NEW_REV#v}\":g" config.h - git add -A - git commit -m "Update libcups to $NEW_REV" - - git tag $NEW_REV - echo echo ">>> Updated license" cp LICENSE.txt NOTICE + echo $NEW_REV > libcups_version + git add -A + git commit -m "Update libcups to $NEW_REV" + echo echo ">>> Updated libcups from $CURRENT_REV to $NEW_REV" fi |