From 2a802ce6fe596dcc5a67c5132cbc4ae3d76046b4 Mon Sep 17 00:00:00 2001
From: Arrehn <none@none>
Date: Sat, 23 Oct 2010 12:46:41 -0400
Subject: [PATCH] Added version update on build, better error checking

---
 build_firestorm_macosx.sh        | 12 +++++++++++-
 indra/llcommon/llversionviewer.h |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/build_firestorm_macosx.sh b/build_firestorm_macosx.sh
index 162b7bc6ba..67b66dcc00 100755
--- a/build_firestorm_macosx.sh
+++ b/build_firestorm_macosx.sh
@@ -31,6 +31,9 @@ fi
 ###  Main Logic
 ### 
 
+if [ ! -d `dirname $LOG` ] ; then
+	mkdir -p `dirname $LOG`
+fi
 
 pushd indra
 if [ $WANTS_CLEAN -eq $TRUE ] ; then
@@ -45,9 +48,16 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
 fi
 
 if [ $WANTS_BUILD -eq $TRUE ] ; then
+	echo -n "Updating build version to "
+	buildVer=`grep -o -e "LL_VERSION_BUILD = [0-9]\+" llcommon/llversionviewer.h | cut -f 3 -d " "`
+	echo $((++buildVer))
+	sed -e "s#LL_VERSION_BUILD = [0-9][0-9]*#LL_VERSION_BUILD = ${buildVer}#" llcommon/llversionviewer.h > llcommon/llversionviewer.h1
+	mv llcommon/llversionviewer.h1 llcommon/llversionviewer.h
+	
+
 	echo "Building in progress... Check $LOG for verbose status"
 	# -sdk macosx10.6
-	xcodebuild -project build-darwin-i386/SecondLife.xcodeproj -alltargets -configuration Release GCC_OPTIMIZATION_LEVEL=3 ARCHS=i386 GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee $LOG | grep -e "make.*Error "
+	xcodebuild -project build-darwin-i386/SecondLife.xcodeproj -alltargets -configuration Release GCC_OPTIMIZATION_LEVEL=3 ARCHS=i386 GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee $LOG | grep -e "[(make.*Error)|(xcodebuild.*Error)] "
 	echo "Complete"
 fi
 popd
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 7dbec1371f..2215625e22 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -30,7 +30,7 @@
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 2;
 const S32 LL_VERSION_PATCH = 1;
-const S32 LL_VERSION_BUILD = 12;
+const S32 LL_VERSION_BUILD = 14;
 
 const char * const LL_CHANNEL = "Firestorm Developer";