From 0fab046e486b240a1fef4d04b55fdb5bf4c3167c Mon Sep 17 00:00:00 2001 From: Drew Short Date: Tue, 26 Aug 2014 18:47:11 -0500 Subject: [PATCH] Finally think I might've solved the tagging issue --- build/linux/createPatchRelease.sh | 2 ++ build/linux/package.sh | 12 ++++++------ pom.xml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build/linux/createPatchRelease.sh b/build/linux/createPatchRelease.sh index 9215e86..9e9da02 100755 --- a/build/linux/createPatchRelease.sh +++ b/build/linux/createPatchRelease.sh @@ -22,6 +22,8 @@ mvn versions:set -DnewVersion=$VERSION cd $HOME . createBuildRelease.sh +echo $VERSION + #commit the new patch version git commit -a -m "Creating patch version $VERSION" diff --git a/build/linux/package.sh b/build/linux/package.sh index 10182b3..470813d 100755 --- a/build/linux/package.sh +++ b/build/linux/package.sh @@ -4,14 +4,14 @@ cd ../.. packageProject () { - VERSION=$1 + local LOCAL_VERSION=$1 RELEASE=$3 ROOT=$PWD cd $2 #Getting variables that are produced by the script NAME=$(head -1 ./name.info) - PACKAGENAME=$NAME-$VERSION + PACKAGENAME=$NAME-$LOCAL_VERSION PACKAGETAR=$PACKAGENAME.tar.gz PACKAGEZIP=$PACKAGENAME.zip TARGET=$PWD/target @@ -31,7 +31,7 @@ packageProject () } #Getting variables that are produced by the script -VERSION=$(head -1 ./version.info) +VERSIONSTRING=$(head -1 ./version.info) RELEASE="$PWD/target" #make sure release exists and is empty @@ -40,6 +40,6 @@ if [ -d $RELEASE ]; then fi mkdir $RELEASE -packageProject $VERSION "./cli" $RELEASE -packageProject $VERSION "./gui" $RELEASE -#packageProject $VERSION "./daemon" $RELEASE +packageProject $VERSIONSTRING "./cli" $RELEASE +packageProject $VERSIONSTRING "./gui" $RELEASE +#packageProject $VERSIONSTRING "./daemon" $RELEASE diff --git a/pom.xml b/pom.xml index 82809e1..a29cb58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.sothr.imagetools Image-Tools - 0.1.2-DEV + 0.1.1-DEV pom Image-Tools