diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2017-05-12 07:09:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-12 07:09:37 +0000 |
| commit | 8bc4293a1e2afae6a72036c4e7452366121dccd8 (patch) | |
| tree | d81a373a1d60ae2f18a469f14251296b54f25380 | |
| parent | dfd99f566b22f10f1e3ad250ac2cca7770c11f27 (diff) | |
| parent | 713d904c3b721e94295257b66609733f713cd1f4 (diff) | |
| download | libcups-8bc4293a1e2afae6a72036c4e7452366121dccd8.tar.gz | |
Store version in file, not a git tag. am: e78fa6dfe2 am: 0c904dcfc0 am: 4faf284244
am: 713d904c3b
Change-Id: Ifed6dcfab397fbdaff6f91ac80272882adccd683
| -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 |