From f83801ab59a77a76a5f30e20a2bb02e13318ec57 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Wed, 16 Feb 2011 15:46:34 -0800
Subject: temporarily turn off precompiled header usage to work around
 Incredibuild issues.

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index a612a5c5cd..1eaa4a48b1 100755
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,7 @@ pre_build()
 {
   local variant="$1"
   begin_section "Pre$variant"
-  "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON
+  "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE
   end_section "Pre$variant"
 }
 
-- 
cgit v1.2.3


From e713da24e3a591ee91e52ccd45cfe1c05c5dd769 Mon Sep 17 00:00:00 2001
From: "Andrew A. de Laix" <alain@lindenlab.com>
Date: Thu, 17 Feb 2011 09:50:08 -0800
Subject: explicity call python scripts with python so they work on all
 platforms.

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1eaa4a48b1..eb34665eae 100755
--- a/build.sh
+++ b/build.sh
@@ -106,7 +106,7 @@ eval '$build_'"$arch" || pass
 # File no longer exists in code-sep branch, so let's make sure it exists in order to use it.
 if test -f scripts/update_version_files.py ; then
   begin_section UpdateVer
-  scripts/update_version_files.py \
+  python scripts/update_version_files.py \
           --channel="$viewer_channel" \
           --server_channel="$server_channel" \
           --revision=$revision \
@@ -117,7 +117,7 @@ fi
 
 # Now retrieve the version for use in the version manager
 # First three parts only, $revision will be appended automatically.
-build_viewer_update_version_manager_version=`scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'`
+build_viewer_update_version_manager_version=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'`
 
 export autobuild_dir="$here/../../../autobuild/bin/"
 if [ -d "$autobuild_dir" ]
-- 
cgit v1.2.3


From d9a47b33954010bbb1d52491940004368363641b Mon Sep 17 00:00:00 2001
From: Jennifer Leech <jenn@lindenlab.com>
Date: Fri, 25 Feb 2011 14:48:13 -0800
Subject: s/build-vc80/build-vc100/

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index eb34665eae..f0bdc5d78d 100755
--- a/build.sh
+++ b/build.sh
@@ -27,7 +27,7 @@ build_dir_Linux()
 
 build_dir_CYGWIN()
 {
-  echo build-vc80
+  echo build-vc100
 }
 
 installer_Darwin()
-- 
cgit v1.2.3


From a14c5e8f31ede83b0d72aec2ed363ae55b866b09 Mon Sep 17 00:00:00 2001
From: Jennifer Leech <jenn@lindenlab.com>
Date: Tue, 1 Mar 2011 11:30:47 -0800
Subject: Added 'env|sort' to build.sh for debugging TC builds.

---
 build.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index f0bdc5d78d..b75823f45f 100755
--- a/build.sh
+++ b/build.sh
@@ -141,6 +141,10 @@ fi
 # load autbuild provided shell functions and variables
 eval "$("$AUTOBUILD" source_environment)"
 
+# dump environment variables for debugging
+env|sort
+
+
 # Install packages.
 "$AUTOBUILD" install --skip-license-check
 
-- 
cgit v1.2.3


From 6a10c803d3b7d16c25d085f19fafd404b95eb485 Mon Sep 17 00:00:00 2001
From: Jennifer Leech <jenn@lindenlab.com>
Date: Tue, 1 Mar 2011 14:26:24 -0800
Subject: Setting TMP env var to be used during builds. Possible collision when
 using VS2010 with system-wide TMP directory.

Also temporarily disabling Debug and Release builds to get a faster loop cyle on TC.
---
 build.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index b75823f45f..645c6d05ac 100755
--- a/build.sh
+++ b/build.sh
@@ -165,6 +165,8 @@ do
   build_dir_stubs="$build_dir/win_setup/$variant"
   rm -rf "$build_dir"
   mkdir -p "$build_dir"
+  mkdir -p "$build_dir/tmp"
+  export TMP="$build_dir/tmp"
   if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
   then
     if $build_link_parallel
-- 
cgit v1.2.3