diff --git a/commit-version.sh b/commit-version.sh index 04b4bbd4..56dfef9a 100755 --- a/commit-version.sh +++ b/commit-version.sh @@ -1,5 +1,3 @@ #!/bin/sh - -SNV_VERSION=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -SNV_VERSION=`expr $SNV_VERSION + 1` -echo -n "trunkREV$SNV_VERSION" +SNV_VERSION=`git show -s --format=%h` +echo -n "3.4.1+git$SNV_VERSION" diff --git a/git-commit-version.sh b/git-commit-version.sh index 1856aef9..8797c309 100755 --- a/git-commit-version.sh +++ b/git-commit-version.sh @@ -1,5 +1,5 @@ #!/bin/sh SNV_VERSION=`git show -s --format=%h` -echo -n "3.4.0-Git-$SNV_VERSION" +echo -n "3.4.1+git$SNV_VERSION" diff --git a/version.sh b/version.sh index 48b5a38b..56dfef9a 100755 --- a/version.sh +++ b/version.sh @@ -1,10 +1,3 @@ #!/bin/sh - -SNV_VERSION=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -test $SNV_VERSION || SNV_VERSION=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2` -test $SNV_VERSION || SNV_VERSION=UNKNOWN -GITDIR=".git" -if [ -d "$GITDIR" ]; then - SNV_VERSION=`git show -s --format=%h` -fi -echo -n "3.4.1~rc01" +SNV_VERSION=`git show -s --format=%h` +echo -n "3.4.1+git$SNV_VERSION"