From 2ed386e07b5c1bb7dd47a403548746e7416acd67 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 4 Apr 2012 09:17:58 -0400
Subject: STORM-1787 remove dead code that causes spurious build log error
 reports

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index c7c89fe3c2..7c11308f0c 100755
--- a/build.sh
+++ b/build.sh
@@ -132,10 +132,6 @@ if test -f scripts/update_version_files.py ; then
   end_section UpdateVer
 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=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'`
-
 if [ -z "$AUTOBUILD" ]
 then
   export autobuild_dir="$here/../../../autobuild/bin/"
-- 
cgit v1.2.3


From 92ae8c8472b1efb961dd9b0bb8473425d8b703e4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 25 Apr 2012 16:45:24 -0400
Subject: WOLF-318: change default verbosity of some unit tests to keep them
 out of the logs when passing WOLF-363: (partial) correct ordering of cleaning
 build dir vs running           'autobuild install'

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 7c11308f0c..8ca3208087 100755
--- a/build.sh
+++ b/build.sh
@@ -173,9 +173,6 @@ eval "$("$AUTOBUILD" source_environment)"
 env|sort
 
 
-# Install packages.
-"$AUTOBUILD" install --skip-license-check
-
 # Now run the build
 succeeded=true
 build_processes=
@@ -191,10 +188,19 @@ do
   begin_section "Do$variant"
   build_dir=`build_dir_$arch $variant`
   build_dir_stubs="$build_dir/win_setup/$variant"
+
+  begin_section "PreClean"
   rm -rf "$build_dir"
+  end_section "PreClean"
+
   mkdir -p "$build_dir"
   mkdir -p "$build_dir/tmp"
-  #export TMP="$build_dir/tmp"
+
+  # Install packages.
+  begin_section "AutobuildInstall" 
+  "$AUTOBUILD" install --verbose --skip-license-check
+  end_section "AutobuildInstall" 
+
   if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
   then
     if $build_link_parallel
-- 
cgit v1.2.3