From 33b64f810d758f3084f535652695156b6fca50ea Mon Sep 17 00:00:00 2001
From: Greg Schueler <greg.schueler@gmail.com>
Date: Tue, 15 May 2012 12:12:58 -0700
Subject: [PATCH] Update setversion.sh/makefile to add version tag

---
 Makefile      |  7 ++++++-
 setversion.sh | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 04ad0f960eb..aa85c788bd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
 SHELL=/bin/bash
 
-VERSION=$(shell grep version.number= ${PWD}/version.properties | cut -d= -f 2)
+VNUMBER=$(shell grep version.number= ${PWD}/version.properties | cut -d= -f 2)
+VTAG=$(shell grep version.tag= ${PWD}/version.properties | cut -d= -f 2)
+VERSION=${VNUMBER}-${VTAG}
+ifeq ($(strip $(VTAG)),GA)
+VERSION=${VNUMBER}
+endif
 RELEASE=$(shell grep version.release.number= ${PWD}/version.properties | cut -d= -f 2)
 
 GRAILSVERS=1.3.7
diff --git a/setversion.sh b/setversion.sh
index 06a313c4302..bb814d8c6ec 100755
--- a/setversion.sh
+++ b/setversion.sh
@@ -4,7 +4,7 @@ CUR_VERSION=$(grep version.number= `pwd`/version.properties | cut -d= -f 2)
 CUR_RELEASE=$(grep version.release.number= `pwd`/version.properties | cut -d= -f 2)
 CUR_TAG=$(grep version.tag= `pwd`/version.properties | cut -d= -f 2)
 
-echo "current VERSION: $CUR_VERSION"
+echo "current NUMBER: $CUR_VERSION"
 echo "current RELEASE: $CUR_RELEASE"
 echo "current TAG: $CUR_TAG"
 
@@ -33,9 +33,12 @@ if [ "$TAG" = "GA" ] ; then
     IDENT_TAG=
 fi
 
-echo "new VERSION: $VERSION"
+VNAME="${VERSION}${IDENT_TAG}"
+
+echo "new NUMBER: $VERSION"
 echo "new RELEASE: $RELEASE"
 echo "new TAG: $TAG"
+echo "new VERSION: ${VNAME}"
 
 #alter version.properties
 perl  -i'.orig' -p -e "s#^version\.number\s*=.*\$#version.number=$VERSION#" `pwd`/version.properties
@@ -50,36 +53,36 @@ XML=$(which xmlstarlet)
 if [ -z "$XML" ] ; then
     XML=$(which xml)
 fi
-$XML ed -P -S -N p=http://maven.apache.org/POM/4.0.0 -u "/p:project/p:version" -v "$VERSION" pom.xml > pom_new.xml
+$XML ed -P -S -N p=http://maven.apache.org/POM/4.0.0 -u "/p:project/p:version" -v "${VNAME}" pom.xml > pom_new.xml
 mv pom_new.xml pom.xml
 
 echo MODIFIED: `pwd`/pom.xml
 
 #alter grails i18n messages main.app.version.num=1.0.0
-perl  -i'.orig' -p -e "s#^app\.version\s*=.*\$#app.version=$VERSION#" `pwd`/rundeckapp/application.properties
+perl  -i'.orig' -p -e "s#^app\.version\s*=.*\$#app.version=${VNAME}#" `pwd`/rundeckapp/application.properties
 perl  -i'.orig' -p -e "s#^build\.ident\s*=.*\$#build.ident=$VERSION-$RELEASE$IDENT_TAG#" `pwd`/rundeckapp/application.properties
 
 echo MODIFIED: `pwd`/rundeckapp/application.properties
 
-$XML ed -P -S -N p=http://maven.apache.org/POM/4.0.0 -u "/p:project/p:version" -v "$VERSION" rundeckapp/pom.xml > rundeckapp/pom_new.xml
+$XML ed -P -S -N p=http://maven.apache.org/POM/4.0.0 -u "/p:project/p:version" -v "${VNAME}" rundeckapp/pom.xml > rundeckapp/pom_new.xml
 mv rundeckapp/pom_new.xml rundeckapp/pom.xml
 
 echo MODIFIED: `pwd`/rundeckapp/pom.xml
 
 #modify core/build.gradle
-perl  -i'.orig' -p -e "s#^version\s*=.*\$#version = '$VERSION'#" `pwd`/core/build.gradle
+perl  -i'.orig' -p -e "s#^version\s*=.*\$#version = '$VNAME'#" `pwd`/core/build.gradle
 cd core/ && ./gradlew -PbuildNum=${RELEASE} createPom && cd ..
 
 echo MODIFIED: `pwd`/core/build.gradle
 
 #modify plugins/build.gradle
-perl  -i'.orig' -p -e "s#^(\s*)version\s*=.*\$#\1version = '$VERSION'#" `pwd`/plugins/build.gradle
+perl  -i'.orig' -p -e "s#^(\s*)version\s*=.*\$#\1version = '$VNAME'#" `pwd`/plugins/build.gradle
 cd plugins/ && ./gradlew createPom && cd ..
 
 echo MODIFIED: `pwd`/plugins/build.gradle
 
 #modify rundeck-launcher/build.gradle
-perl  -i'.orig' -p -e "s#^(\s*)version\s*=.*\$#\1version = '$VERSION'#" `pwd`/rundeck-launcher/build.gradle
+perl  -i'.orig' -p -e "s#^(\s*)version\s*=.*\$#\1version = '$VNAME'#" `pwd`/rundeck-launcher/build.gradle
 cd rundeck-launcher/ && ./gradlew createPom && cd ..
 
 echo MODIFIED: `pwd`/rundeck-launcher/build.gradle