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

Added version update on build, better error checking

master
Arrehn 2010-10-23 12:46:41 -04:00
parent b252a0fd96
commit 2a802ce6fe
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_firestorm_macosx.sh
View File

@ -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

2
indra/llcommon/llversionviewer.h
View File

@ -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";