From ff30851c57f88d331dd1360ccb6e4dd269d38892 Mon Sep 17 00:00:00 2001 From: Arrehn Date: Sun, 27 Mar 2011 11:05:24 -0400 Subject: [PATCH] [build] Always do versioning logic when running configure logic, because configure depends on a valid llversionviewer.cpp file --- build_firestorm_macosx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_firestorm_macosx.sh b/build_firestorm_macosx.sh index 47e3078d0d..b57db0c633 100755 --- a/build_firestorm_macosx.sh +++ b/build_firestorm_macosx.sh @@ -217,7 +217,7 @@ if [ $WANTS_CLEAN -eq $TRUE ] ; then find . -name "*.pyc" -exec rm {} \; fi -if [ $WANTS_VERSION -eq $TRUE ] ; then +if [ \( $WANTS_VERSION -eq $TRUE \) -o \( $WANTS_CONFIG -eq $TRUE \) ] ; then buildVer=`hg summary | head -1 | cut -d " " -f 2 | cut -d : -f 1` majorVer=`cat Version | cut -d "=" -f 2 | cut -d "." -f 1` minorVer=`cat Version | cut -d "=" -f 2 | cut -d "." -f 2`