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

Fix to stop the build process from modifying tracked files. Also stop leaking local system information into the repository.

meow-7.2.2
Tonya Souther 2010-11-27 12:29:29 -06:00
parent 7db1d42478
commit 79c8c8bc25
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -19,6 +19,7 @@ indra/lib/mono/indra/*.dll
indra/lib/mono/indra/*.exe
indra/lib/mono/indra/*.pdb
indra/lib/python/eventlet/
indra/llcommon/llversionviewer.h.built
indra/llwindow/glh/glh_linear.h
indra/newview/app_settings/mozilla
indra/newview/app_settings/mozilla-runtime-*

5
build_firestorm_linux.sh
View File

@ -69,6 +69,11 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
echo "Building in progress. Check $LOG for verbose status."
./develop.py -t release build 2>&1 | tee $LOG | grep -e "make.*Error "
trap - INT TERM EXIT
# Save the .h file we built with in case of errors in compile.
# Except during the build process, the .h file should ALWAYS be the
# same as existed in the source repository to avoid merge conflicts
# during updates.
mv llcommon/llversionviewer.h llcommon/llversionviewer.h.built
mv llcommon/llversionviewer.h.build llcommon/llversionviewer.h
echo "Complete"
fi

14
build_firestorm_macosx.sh
View File

@ -216,8 +216,10 @@ if [ $WANTS_VERSION -eq $TRUE ] ; then
echo -n "Setting build version to "
buildVer=`hg summary | head -1 | cut -d " " -f 2 | cut -d : -f 1`
echo "$buildVer."
cp llcommon/llversionviewer.h llcommon/llversionviewer.h.lastBuild
sed -e "s#LL_VERSION_BUILD = .*\$#LL_VERSION_BUILD = ${buildVer};#" -e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" llcommon/llversionviewer.h.lastBuild > llcommon/llversionviewer.h
cp llcommon/llversionviewer.h llcommon/llversionviewer.h.build
sed -e "s#LL_VERSION_BUILD = .*\$#LL_VERSION_BUILD = ${buildVer};#" \
-e "s#LL_CHANNEL = .*\$#LL_CHANNEL = \"Firestorm-$CHANNEL\";#" \
llcommon/llversionviewer.h.build > llcommon/llversionviewer.h
fi
if [ $WANTS_BUILD -eq $TRUE ] ; then
@ -230,8 +232,12 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
GCC_ENABLE_SSE3_EXTENSIONS=YES 2>&1 | tee $LOG | \
grep -e "[(make.*Error)|(xcodebuild.*Error)] "
trap - INT TERM EXIT
# Don't move this back, it prevents us from diagnosing llversionviewer.h build breaks.
#mv llcommon/llversionviewer.h.build llcommon/llversionviewer.h
# Save the .h file we built with in case of errors in compile.
# Except during the build process, the .h file should ALWAYS be the
# same as existed in the source repository to avoid merge conflicts
# during updates.
mv llcommon/llversionviewer.h llcommon/llversionviewer.h.built
mv llcommon/llversionviewer.h.build llcommon/llversionviewer.h
echo "Complete."
fi
popd > /dev/null

5
build_firestorm_win32.sh
View File

@ -239,6 +239,11 @@ if [ $WANTS_BUILD -eq $TRUE ] ; then
echo "Building in progress. Check $LOG for verbose status."
$WINPYTHON develop.py -G vc80 -t $BTYPE build 2>&1 | tee -a $LOG | grep Build
trap - INT TERM EXIT
# Save the .h file we built with in case of errors in compile.
# Except during the build process, the .h file should ALWAYS be the
# same as existed in the source repository to avoid merge conflicts
# during updates.
mv -f llcommon/llversionviewer.h llcommon/llversionviewer.h.built
mv -f llcommon/llversionviewer.h.build llcommon/llversionviewer.h
echo "Complete"
fi

2
indra/llcommon/llversionviewer.h
View File

@ -32,7 +32,7 @@ const S32 LL_VERSION_MINOR = 4;
const S32 LL_VERSION_PATCH = 0;
const S32 LL_VERSION_BUILD = 13860;
const char * const LL_CHANNEL = "Firestorm-private-Romana.local";
const char * const LL_CHANNEL = "Firestorm-private-yakko.conmicro.com";
#if LL_DARWIN
const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.snowglobe.viewer";