From 79c8c8bc25f80e72192319276aacea2b944e5863 Mon Sep 17 00:00:00 2001
From: Tonya Souther <tonya.souther@gmail.com>
Date: Sat, 27 Nov 2010 12:29:29 -0600
Subject: [PATCH] Fix to stop the build process from modifying tracked files.
 Also stop leaking local system information into the repository.

---
 .hgignore                        |  1 +
 build_firestorm_linux.sh         |  5 +++++
 build_firestorm_macosx.sh        | 14 ++++++++++----
 build_firestorm_win32.sh         |  5 +++++
 indra/llcommon/llversionviewer.h |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.hgignore b/.hgignore
index 57808a130f..9c08fa54d9 100644
--- a/.hgignore
+++ b/.hgignore
@@ -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-*
diff --git a/build_firestorm_linux.sh b/build_firestorm_linux.sh
index 82e49cd715..566afb5adc 100755
--- a/build_firestorm_linux.sh
+++ b/build_firestorm_linux.sh
@@ -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
diff --git a/build_firestorm_macosx.sh b/build_firestorm_macosx.sh
index 5e75e23464..04515fab54 100755
--- a/build_firestorm_macosx.sh
+++ b/build_firestorm_macosx.sh
@@ -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
diff --git a/build_firestorm_win32.sh b/build_firestorm_win32.sh
index f593e4fe0d..0a501648c2 100644
--- a/build_firestorm_win32.sh
+++ b/build_firestorm_win32.sh
@@ -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
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 99976ef3ab..3d3efc23a7 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -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";