From d7e90f4160aaa81e30206c80047b82833c049482 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 7 Feb 2013 11:56:57 -0500
Subject: derive version number from indra/VIEWER_VERSION.txt

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 15f0463aff..e96aec58ec 100755
--- a/build.sh
+++ b/build.sh
@@ -159,21 +159,6 @@ fi
 # Check to see if we're skipping the platform
 eval '$build_'"$arch" || pass
 
-# Run the version number update script
-# 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
-  eval $(python scripts/update_version_files.py \
-                --channel="$viewer_channel" \
-                --server_channel="$server_channel" \
-                --revision=$revision \
-                --verbose \
-         | sed -n -e "s,Setting viewer channel/version: '\([^']*\)' / '\([^']*\)',VIEWER_CHANNEL='\1';VIEWER_VERSION='\2',p")\
-  || fail update_version_files.py
-  echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > summary.json
-  end_section UpdateVer
-fi
-
 if [ -z "$AUTOBUILD" ]
 then
   export autobuild_dir="$here/../../../autobuild/bin/"
-- 
cgit v1.2.3


From 8c7bc4d8636fafafab573051662987af8d05eb4d Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 12 Feb 2013 13:16:47 -0500
Subject: remove setting login channel from build script

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index e96aec58ec..638ec33281 100755
--- a/build.sh
+++ b/build.sh
@@ -71,7 +71,6 @@ pre_build()
      -DPACKAGE:BOOL=ON \
      -DRELEASE_CRASH_REPORTING:BOOL=ON \
      -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
-     -DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
-- 
cgit v1.2.3


From 70ae613209bdc03f7ff45075e673e225447ec7a5 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 13 Mar 2013 14:04:50 -0400
Subject: remove obsolete debugging messages and commented out code

---
 build.sh | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 638ec33281..8fde4f3fab 100755
--- a/build.sh
+++ b/build.sh
@@ -65,7 +65,7 @@ pre_build()
     && [ -r "$master_message_template_checkout/message_template.msg" ] \
     && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
 
-    check_for "Before 'autobuild configure'" ${build_dir}/packages/dictionaries
+    check_for "Confirm dictionaries are installed before 'autobuild configure'" ${build_dir}/packages/dictionaries
 
     "$AUTOBUILD" configure -c $variant -- \
      -DPACKAGE:BOOL=ON \
@@ -75,8 +75,6 @@ pre_build()
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
 
-    check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
-
  end_section "Pre$variant"
 }
 
@@ -109,7 +107,6 @@ build()
   if $build_viewer
   then
     begin_section "Viewer$variant"
-    check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries
 
     "$AUTOBUILD" build --no-configure -c $variant
     viewer_build_ok=$?
@@ -122,8 +119,6 @@ build()
     else
       echo false >"$build_dir"/build_ok
     fi
-    check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries
-
   fi
 }
 
@@ -181,27 +176,11 @@ then
 fi
 
 # load autbuild provided shell functions and variables
-# Merov: going back to the previous code that passes even if it fails catching a failure
-# TODO: use the correct code here under and fix the llbase import in python code
-#if "$AUTOBUILD" source_environment > source_environment
-#then
-#  . source_environment
-#else
-  # dump environment variables for debugging
-#  env|sort
-#  record_failure "autobuild source_environment failed"
-#  cat source_environment >&3
-#  exit 1
-#fi
 eval "$("$AUTOBUILD" source_environment)"
 
 # dump environment variables for debugging
 env|sort
 
-check_for "Before 'autobuild install'" ${build_dir}/packages/dictionaries
-
-
-check_for "After 'autobuild install'" ${build_dir}/packages/dictionaries
 # Now run the build
 succeeded=true
 build_processes=
-- 
cgit v1.2.3