summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJennifer Leech <jenn@lindenlab.com>2011-03-01 14:26:24 -0800
committerJennifer Leech <jenn@lindenlab.com>2011-03-01 14:26:24 -0800
commit6a10c803d3b7d16c25d085f19fafd404b95eb485 (patch)
tree02aa075d8689d867ea91e2d9e5c3247bcb689e23
parenta14c5e8f31ede83b0d72aec2ed363ae55b866b09 (diff)
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.
-rw-r--r--BuildParams8
-rwxr-xr-xbuild.sh2
2 files changed, 10 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index cf837dac70..3f2d74421a 100644
--- a/BuildParams
+++ b/BuildParams
@@ -238,4 +238,12 @@ viewer-asset-delivery-metrics.build_server_tests = false
#==============================================================================
viewer-autobuild.build_link_parallel = false
viewer-vs2010.build_link_parallel = false
+
+
+#==============================================================================
+# vs2010 debug - for TC debugging only
+#==============================================================================
+viewer-vs2010.build_CYGWIN_Debug = false
+viewer-vs2010.build_CYGWIN_Release = false
+
# eof
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