From c5ce29c871a28c90691eb7391a176c5e0cbead91 Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 16 Mar 2011 12:30:41 -0700
Subject: Comment out setting of TMP, do not recompute AUTOBUILD if it is
 already defined.

---
 build.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 625a09009b..86693a6fdb 100755
--- a/build.sh
+++ b/build.sh
@@ -119,23 +119,26 @@ fi
 # 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]*$//'`
 
-export autobuild_dir="$here/../../../autobuild/bin/"
-if [ -d "$autobuild_dir" ]
+if [ -z "$AUTOBUILD" ]
 then
-  export AUTOBUILD="$autobuild_dir"autobuild
-  if [ -x "$AUTOBUILD" ]
+  export autobuild_dir="$here/../../../autobuild/bin/"
+  if [ -d "$autobuild_dir" ]
   then
-    # *HACK - bash doesn't know how to pass real pathnames to native windows python
-    case "$arch" in
-    CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;;
-    esac
+    export AUTOBUILD="$autobuild_dir"autobuild
+    if [ -x "$AUTOBUILD" ]
+    then
+      # *HACK - bash doesn't know how to pass real pathnames to native windows python
+      case "$arch" in
+      CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;;
+      esac
+    else
+      record_failure "Not executable: $AUTOBUILD"
+      exit 1
+    fi
   else
-    record_failure "Not executable: $AUTOBUILD"
+    record_failure "Not found: $autobuild_dir"
     exit 1
   fi
-else
-  record_failure "Not found: $autobuild_dir"
-  exit 1
 fi
 
 # load autbuild provided shell functions and variables
@@ -166,7 +169,7 @@ do
   rm -rf "$build_dir"
   mkdir -p "$build_dir"
   mkdir -p "$build_dir/tmp"
-  export TMP="$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.3


From fea0cefcb3442ca640a7f502ba59398d32de3dbf Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 16 Mar 2011 16:44:19 -0700
Subject: Add a more precise error check for "autobuild source_environment".

---
 build.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 86693a6fdb..f0c5dc91fc 100755
--- a/build.sh
+++ b/build.sh
@@ -142,7 +142,16 @@ then
 fi
 
 # load autbuild provided shell functions and variables
-eval "$("$AUTOBUILD" source_environment)"
+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
 
 # dump environment variables for debugging
 env|sort
-- 
cgit v1.3


From 92a68f350479cb4319c13e6784fb60e9d9b6d355 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 16 Mar 2011 22:45:50 -0700
Subject: Autobuild: go back to ignoring errors on autobuild source_environment
 invocation for the moment

---
 build.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index f0c5dc91fc..e302d95e76 100755
--- a/build.sh
+++ b/build.sh
@@ -142,16 +142,19 @@ then
 fi
 
 # load autbuild provided shell functions and variables
-if "$AUTOBUILD" source_environment > source_environment
-then
-  . source_environment
-else
+# 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
+#  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
-- 
cgit v1.3


From f5b33904e6eb0c6eca59f3b03be7666cff5bb49a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 18 Mar 2011 12:44:57 -0400
Subject: add upload of version-independent quicklinks

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index e302d95e76..270dede0dc 100755
--- a/build.sh
+++ b/build.sh
@@ -248,6 +248,7 @@ then
       succeeded=$build_coverity
     else
       upload_item installer "$package" binary/octet-stream
+      upload_item quicklink "$package" binary/octet-stream
 
       # Upload crash reporter files.
       case "$last_built_variant" in
-- 
cgit v1.3