livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let's just go with revcount since we're going to build from tip anyway where it matters (this should be ok for LGPL and release repo)

master
Ansariel 2019-12-14 17:02:34 +01:00
parent c1a06438ba
commit d12c9550e9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/configure_firestorm.sh
View File

@ -394,14 +394,14 @@ fi
if [ \( $WANTS_VERSION -eq $TRUE \) -o \( $WANTS_CONFIG -eq $TRUE \) ] ; then
echo "Versioning..."
pushd ..
if [ -d .git ]
then
buildVer=${AUTOBUILD_BUILD_ID}
else
buildVer=`hg summary | head -1 | cut -d " " -f 2 | cut -d : -f 1 | grep "[0-9]*"`
AUTOBUILD_BUILD_ID=${buildVer}
fi
if [ -d .git ]
then
buildVer=`git rev-list --count HEAD`
else
buildVer=`hg summary | head -1 | cut -d " " -f 2 | cut -d : -f 1 | grep "[0-9]*"`
fi
export revision=${buildVer}
majorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 1`
minorVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 2`
patchVer=`cat indra/newview/VIEWER_VERSION.txt | cut -d "." -f 3`