Browse Source

Finally think I might've solved the tagging issue

master
Drew Short 10 years ago
parent
commit
0fab046e48
  1. 2
      build/linux/createPatchRelease.sh
  2. 12
      build/linux/package.sh
  3. 2
      pom.xml

2
build/linux/createPatchRelease.sh

@ -22,6 +22,8 @@ mvn versions:set -DnewVersion=$VERSION
cd $HOME cd $HOME
. createBuildRelease.sh . createBuildRelease.sh
echo $VERSION
#commit the new patch version #commit the new patch version
git commit -a -m "Creating patch version $VERSION" git commit -a -m "Creating patch version $VERSION"

12
build/linux/package.sh

@ -4,14 +4,14 @@ cd ../..
packageProject () packageProject ()
{ {
VERSION=$1
local LOCAL_VERSION=$1
RELEASE=$3 RELEASE=$3
ROOT=$PWD ROOT=$PWD
cd $2 cd $2
#Getting variables that are produced by the script #Getting variables that are produced by the script
NAME=$(head -1 ./name.info) NAME=$(head -1 ./name.info)
PACKAGENAME=$NAME-$VERSION
PACKAGENAME=$NAME-$LOCAL_VERSION
PACKAGETAR=$PACKAGENAME.tar.gz PACKAGETAR=$PACKAGENAME.tar.gz
PACKAGEZIP=$PACKAGENAME.zip PACKAGEZIP=$PACKAGENAME.zip
TARGET=$PWD/target TARGET=$PWD/target
@ -31,7 +31,7 @@ packageProject ()
} }
#Getting variables that are produced by the script #Getting variables that are produced by the script
VERSION=$(head -1 ./version.info)
VERSIONSTRING=$(head -1 ./version.info)
RELEASE="$PWD/target" RELEASE="$PWD/target"
#make sure release exists and is empty #make sure release exists and is empty
@ -40,6 +40,6 @@ if [ -d $RELEASE ]; then
fi fi
mkdir $RELEASE 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

2
pom.xml

@ -4,7 +4,7 @@
<groupId>com.sothr.imagetools</groupId> <groupId>com.sothr.imagetools</groupId>
<artifactId>Image-Tools</artifactId> <artifactId>Image-Tools</artifactId>
<version>0.1.2-DEV</version>
<version>0.1.1-DEV</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Image-Tools</name> <name>Image-Tools</name>

Loading…
Cancel
Save