From d12c9550e9ee1e0eae78330d72e4e5041c50304f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 14 Dec 2019 17:02:34 +0100 Subject: [PATCH] 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) --- scripts/configure_firestorm.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index 6632e9744e..d4753cd82e 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -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`