devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix make VERSION=x.y to work again

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28427 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcin Bukat 2010-10-31 21:52:48 +00:00
parent 77b2d02296
commit 308936cd35
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/version.sh
View file

@ -90,10 +90,12 @@ bzrversion() {
# #
if [ -n "$1" ]; then TOP=$1; else TOP=..; fi if [ -n "$1" ]; then TOP=$1; else TOP=..; fi
# If the VERSIONFILE exisits we use that # setting VERSION var on commandline has precedence
VERSIONFILE=docs/VERSION if [ -z $VERSION ]; then
if [ -r $TOP/$VERSIONFILE ]; then VER=`cat $TOP/$VERSIONFILE`; # If the VERSIONFILE exisits we use that
else VERSIONFILE=docs/VERSION
if [ -r $TOP/$VERSIONFILE ]; then VER=`cat $TOP/$VERSIONFILE`;
else
# Ok, we need to derive it from the Version Control system # Ok, we need to derive it from the Version Control system
if [ -d "$TOP/.git" ]; then if [ -d "$TOP/.git" ]; then
VER=`gitversion $TOP` VER=`gitversion $TOP`
@ -107,7 +109,8 @@ else
VER=`svnversion_safe $TOP/tools`; VER=`svnversion_safe $TOP/tools`;
fi fi
fi fi
fi fi
VERSION=$VER-`date -u +%y%m%d` VERSION=$VER-`date -u +%y%m%d`
fi
echo $VERSION echo $VERSION