summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2010-10-31 21:52:48 +0000
committerMarcin Bukat <marcin.bukat@gmail.com>2010-10-31 21:52:48 +0000
commit308936cd356fa2c559fbc2b2e3273403437e5fe7 (patch)
tree6809ad71bcafa0e77ff1ca76f746f042a858341b /tools
parent77b2d02296b3e549e6115d15f5a778b502dda94c (diff)
downloadrockbox-308936cd356fa2c559fbc2b2e3273403437e5fe7.tar.gz
rockbox-308936cd356fa2c559fbc2b2e3273403437e5fe7.tar.bz2
rockbox-308936cd356fa2c559fbc2b2e3273403437e5fe7.zip
fix make VERSION=x.y to work again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28427 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rwxr-xr-xtools/version.sh35
1 files changed, 19 insertions, 16 deletions
diff --git a/tools/version.sh b/tools/version.sh
index 2e75004901..484a33189c 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -90,24 +90,27 @@ bzrversion() {
#
if [ -n "$1" ]; then TOP=$1; else TOP=..; fi
-# If the VERSIONFILE exisits we use that
-VERSIONFILE=docs/VERSION
-if [ -r $TOP/$VERSIONFILE ]; then VER=`cat $TOP/$VERSIONFILE`;
-else
- # Ok, we need to derive it from the Version Control system
- if [ -d "$TOP/.git" ]; then
- VER=`gitversion $TOP`
- elif [ -d "$TOP/.bzr" ]; then
- VER=`bzrversion $TOP`
+# setting VERSION var on commandline has precedence
+if [ -z $VERSION ]; then
+ # If the VERSIONFILE exisits we use that
+ VERSIONFILE=docs/VERSION
+ if [ -r $TOP/$VERSIONFILE ]; then VER=`cat $TOP/$VERSIONFILE`;
else
- VER=`svnversion_safe $TOP`;
- if [ "$VER" = "unknown" ]; then
- # try getting it from a subdir to test if perhaps they are symlinked
- # from the root
- VER=`svnversion_safe $TOP/tools`;
- fi
+ # Ok, we need to derive it from the Version Control system
+ if [ -d "$TOP/.git" ]; then
+ VER=`gitversion $TOP`
+ elif [ -d "$TOP/.bzr" ]; then
+ VER=`bzrversion $TOP`
+ else
+ VER=`svnversion_safe $TOP`;
+ if [ "$VER" = "unknown" ]; then
+ # try getting it from a subdir to test if perhaps they are symlinked
+ # from the root
+ VER=`svnversion_safe $TOP/tools`;
+ fi
+ fi
fi
-fi
VERSION=$VER-`date -u +%y%m%d`
+fi
echo $VERSION