commit e78fa6dfe24e5677481967b8827478e9b8cbc5e8
author Philip P. Moltmann <moltmann@google.com> Wed May 10 13:29:45 2017 -0700
committer Philip P. Moltmann <moltmann@google.com> Thu May 11 09:37:02 2017 -0700
tree d81a373a1d60ae2f18a469f14251296b54f25380
parent 475aad7be8fb8a8a60e37abbfeccdd4222067dbe

Store version in file, not a git tag.

Bug: 38203442
Test: update_libcups
Change-Id: I4432c0e42db5c6e243ff40cc5ab7502c5e5e7f88

libcups_version

diff --git a/libcups_version b/libcups_version
new file mode 100644
index 0000000..7fe52d3
--- /dev/null
+++ b/libcups_version
@@ -0,0 +1 @@
+v2.2.1

update_libcups.sh

diff --git a/update_libcups.sh b/update_libcups.sh
index 8afbdce..34592d6 100755
--- a/update_libcups.sh
+++ b/update_libcups.sh
@@ -14,7 +14,7 @@
 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 @@
     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