From b604e3c45f3e9a348967892d6a595b4268f97b8b Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 25 Aug 2016 10:29:20 -0400
Subject: convert upload_item to new upload_output

---
 build.sh | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index cd2a9ebf5e..1042cea7da 100755
--- a/build.sh
+++ b/build.sh
@@ -238,7 +238,7 @@ do
               if [ -r "$build_dir/autobuild-package.xml" ]
               then
                   begin_section "Autobuild metadata"
-                  upload_item docs "$build_dir/autobuild-package.xml" text/xml
+                  upload_output "autobuild metadata" "$build_dir/autobuild-package.xml" text/xml
                   if [ "$arch" != "Linux" ]
                   then
                       record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
@@ -254,12 +254,12 @@ do
               if [ -r "$build_dir/doxygen_warnings.log" ]
               then
                   record_event "Doxygen warnings generated; see doxygen_warnings.log"
-                  upload_item log "$build_dir/doxygen_warnings.log" text/plain
+                  upload_output "doxygen log" "$build_dir/doxygen_warnings.log" text/plain ## TBD
               fi
               if [ -d "$build_dir/doxygen/html" ]
               then
                   tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
+                  upload_output "doxygen" "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
               fi
               ;;
             *)
@@ -319,10 +319,10 @@ then
       # upload debian package and create repository
       begin_section "Upload Debian Repository"
       for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
-        upload_item debian $deb_file binary/octet-stream
+        upload_output "installer" $deb_file binary/octet-stream
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
-        upload_item debian_private $deb_file binary/octet-stream
+        upload_output debian $deb_file binary/octet-stream
         have_private_repo=true
       done
 
@@ -339,7 +339,7 @@ then
       if [ $have_private_repo = true ]; then
         eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\
             >"$build_log_dir/private.html" || fatal generating redirect
-        upload_item global_redirect "$build_log_dir/private.html" text/html
+        upload_output global_redirect "$build_log_dir/private.html" text/html private ## TBD
         
       fi
 
@@ -367,9 +367,9 @@ then
       succeeded=$build_coverity
     else
       # Upload base package.
-      upload_item installer "$package" binary/octet-stream
-      upload_item quicklink "$package" binary/octet-stream
-      [ -f $build_dir/summary.json ] && upload_item installer $build_dir/summary.json text/plain
+      upload_output installer "$package" binary/octet-stream
+
+      [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json
 
       # Upload additional packages.
       for package_id in $additional_packages
@@ -377,8 +377,7 @@ then
         package=$(installer_$arch "$package_id")
         if [ x"$package" != x ]
         then
-          upload_item installer "$package" binary/octet-stream
-          upload_item quicklink "$package" binary/octet-stream
+          upload_output "installer $package_id" "$package" binary/octet-stream private
         else
           record_failure "Failed to find additional package for '$package_id'."
         fi
@@ -389,7 +388,7 @@ then
         # Upload crash reporter files
         for symbolfile in $symbolfiles
         do
-          upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
+          upload_output symbolfile "$build_dir/$symbolfile" binary/octet-stream
         done
 
         # Upload the llphysicsextensions_tpv package, if one was produced
@@ -397,7 +396,7 @@ then
         if [ -r "$build_dir/llphysicsextensions_package" ]
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-            upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream
+            upload_output "llphysicsextensions_package" "$llphysicsextensions_package" binary/octet-stream private
         fi
         ;;
       *)
-- 
cgit v1.2.3


From 7ba028d2f36515649b85d3bbc5030288e94b96dc Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 26 Aug 2016 16:28:22 -0400
Subject: rewrap uploads

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1042cea7da..5610730695 100755
--- a/build.sh
+++ b/build.sh
@@ -358,7 +358,7 @@ if $succeeded
 then
   if $build_viewer
   then
-    begin_section Upload Installer
+    begin_section "Uploads"
     # Upload installer
     package=$(installer_$arch)
     if [ x"$package" = x ] || test -d "$package"
@@ -412,7 +412,7 @@ then
           done
       fi
     fi
-    end_section Upload Installer
+    end_section "Uploads"
   else
     record_event "skipping upload of installer"
   fi
-- 
cgit v1.2.3


From 2fc670e2dda6c16b314fa626faf9168ebdec8549 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 28 Aug 2016 10:12:10 -0400
Subject: do custom initialize calls so that viewer_channel is taken into
 account for the buildid

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 5610730695..579db0900d 100755
--- a/build.sh
+++ b/build.sh
@@ -202,10 +202,9 @@ then
     export additional_packages=
 fi
 
-# dump environment variables for debugging
-begin_section "Environment"
-env|sort
-end_section "Environment"
+initialize_context
+codeticket addinput "${viewer_channel}" "viewer_channel"
+initialize_build
 
 # Now run the build
 succeeded=true
@@ -338,7 +337,7 @@ then
 
       if [ $have_private_repo = true ]; then
         eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\
-            >"$build_log_dir/private.html" || fatal generating redirect
+            >"$build_log_dir/private.html" || fatal "generating global redirect"
         upload_output global_redirect "$build_log_dir/private.html" text/html private ## TBD
         
       fi
-- 
cgit v1.2.3


From ea0242e1cebb7ebb9515e39f9dc78ec207cdce22 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 28 Aug 2016 10:42:52 -0400
Subject: collapse autobuild initialize

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 579db0900d..5f55133d81 100755
--- a/build.sh
+++ b/build.sh
@@ -182,6 +182,7 @@ then
     pass
 fi
 
+begin_section "autobuild initialize"
 # ensure AUTOBUILD is in native path form for child processes
 AUTOBUILD="$(native_path "$AUTOBUILD")"
 # set "$autobuild" to cygwin path form for use locally in this script
@@ -194,6 +195,7 @@ fi
 
 # load autobuild provided shell functions and variables
 eval "$("$autobuild" --quiet source_environment)"
+end_section "autobuild initialize"
 
 # something about the additional_packages mechanism messes up buildscripts results.py on Linux
 # since we don't care about those packages on Linux, just zero it out, yes - a HACK
-- 
cgit v1.2.3


From 3c9f7121a2801d44e3db81f212a84a25062debe5 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 28 Aug 2016 11:50:47 -0400
Subject: use codeticket addinput parameter to register viewer_channel

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 5f55133d81..80263254eb 100755
--- a/build.sh
+++ b/build.sh
@@ -205,7 +205,7 @@ then
 fi
 
 initialize_context
-codeticket addinput "${viewer_channel}" "viewer_channel"
+codeticket addinput parameter "viewer_channel" "${viewer_channel}"
 initialize_build
 
 # Now run the build
-- 
cgit v1.2.3


From 5a7855d4b388bcf3d365d20e54db227591febeba Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 30 Aug 2016 08:49:09 -0400
Subject: remove use of old build_ok variable

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 80263254eb..f74501743c 100755
--- a/build.sh
+++ b/build.sh
@@ -142,9 +142,10 @@ build()
   if $build_viewer
   then
     "$autobuild" build --no-configure -c $variant || fatal "failed building $variant"
-    
+    echo true >"$build_dir"/build_ok
+
     # Run build extensions
-    if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]
+    if [ -d ${build_dir}/packages/build-extensions ]
     then
         for extension in ${build_dir}/packages/build-extensions/*.sh
         do
@@ -157,7 +158,6 @@ build()
     # *TODO: Make this a build extension.
     package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
 
-    echo true >"$build_dir"/build_ok
   else
       echo "Skipping build due to configuration build_viewer=${build_viewer}"
       echo true >"$build_dir"/build_ok
-- 
cgit v1.2.3


From f99c3002a1efbd6512094ebd4620c28490c52226 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 30 Aug 2016 16:06:22 -0400
Subject: clean up logging, change debian installer upload name to "deb"

---
 build.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index f74501743c..654ad68ec7 100755
--- a/build.sh
+++ b/build.sh
@@ -159,7 +159,7 @@ build()
     package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
 
   else
-      echo "Skipping build due to configuration build_viewer=${build_viewer}"
+      record_event "Skipping build due to configuration build_viewer=${build_viewer}"
       echo true >"$build_dir"/build_ok
   fi
 }
@@ -232,6 +232,9 @@ do
   then
       begin_section "Build $variant"
       build "$variant" "$build_dir"
+      end_section "Build $variant"
+
+      begin_section "post-build $variant"
       if `cat "$build_dir/build_ok"`
       then
           case "$variant" in
@@ -270,7 +273,8 @@ do
       else
           record_failure "Build of \"$variant\" failed."
       fi
-      end_section "Build $variant"
+      begin_section "post-build $variant"
+
   else
       record_event "configure for $variant failed: build skipped"
   fi
@@ -320,7 +324,7 @@ then
       # upload debian package and create repository
       begin_section "Upload Debian Repository"
       for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
-        upload_output "installer" $deb_file binary/octet-stream
+        upload_output "deb" $deb_file binary/octet-stream
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
         upload_output debian $deb_file binary/octet-stream
-- 
cgit v1.2.3


From bbbe70d33c5e4c8e54df9bc8e76a8611d4c432e2 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 30 Aug 2016 16:52:43 -0400
Subject: simplify redirect generator

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 654ad68ec7..d7b95e8987 100755
--- a/build.sh
+++ b/build.sh
@@ -342,10 +342,9 @@ then
       done
 
       if [ $have_private_repo = true ]; then
-        eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\
+        $python_command  $(native_path "$helper/hg/bin/redirect.py") "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\
             >"$build_log_dir/private.html" || fatal "generating global redirect"
-        upload_output global_redirect "$build_log_dir/private.html" text/html private ## TBD
-        
+        upload_output global_redirect "$build_log_dir/private.html" text/html private
       fi
 
       end_section "Upload Debian Repository"
-- 
cgit v1.2.3


From bd2005e078b3fa60a0acc72ef06bf7ba073b5fea Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 1 Sep 2016 21:08:26 -0400
Subject: convert redirect to new python convention

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index d7b95e8987..9b0b8399a3 100755
--- a/build.sh
+++ b/build.sh
@@ -342,7 +342,7 @@ then
       done
 
       if [ $have_private_repo = true ]; then
-        $python_command  $(native_path "$helper/hg/bin/redirect.py") "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\
+        python_cmd "$helpers/redirect.py" "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\
             >"$build_log_dir/private.html" || fatal "generating global redirect"
         upload_output global_redirect "$build_log_dir/private.html" text/html private
       fi
-- 
cgit v1.2.3


From 32d52ec240d77e4a2cdf42b6c1ca5c9d7a9650a8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 6 Sep 2016 12:08:03 -0400
Subject: display build metadata, remove obsolete private.html

---
 build.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 9b0b8399a3..ea3e6b6a72 100755
--- a/build.sh
+++ b/build.sh
@@ -141,9 +141,12 @@ build()
   local variant="$1"
   if $build_viewer
   then
+    begin_section "autobuild $variant"
     "$autobuild" build --no-configure -c $variant || fatal "failed building $variant"
     echo true >"$build_dir"/build_ok
-
+    end_section "autobuild $variant"
+    
+    begin_section "extensions $variant"
     # Run build extensions
     if [ -d ${build_dir}/packages/build-extensions ]
     then
@@ -157,6 +160,7 @@ build()
 
     # *TODO: Make this a build extension.
     package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
+    end_section "extensions $variant"
 
   else
       record_event "Skipping build due to configuration build_viewer=${build_viewer}"
@@ -273,7 +277,7 @@ do
       else
           record_failure "Build of \"$variant\" failed."
       fi
-      begin_section "post-build $variant"
+      end_section "post-build $variant"
 
   else
       record_event "configure for $variant failed: build skipped"
@@ -340,13 +344,6 @@ then
           mv $build_log_dir/$debian_repo_type $build_log_dir/${debian_repo_type}_pushed
         fi
       done
-
-      if [ $have_private_repo = true ]; then
-        python_cmd "$helpers/redirect.py" "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\
-            >"$build_log_dir/private.html" || fatal "generating global redirect"
-        upload_output global_redirect "$build_log_dir/private.html" text/html private
-      fi
-
       end_section "Upload Debian Repository"
       
     else
@@ -373,7 +370,7 @@ then
       # Upload base package.
       upload_output installer "$package" binary/octet-stream
 
-      [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json
+      [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json display
 
       # Upload additional packages.
       for package_id in $additional_packages
-- 
cgit v1.2.3


From 9a1edafbf1e2ec5a4db3085bc5738527c4b090a8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 6 Sep 2016 12:17:01 -0400
Subject: use debian package names in uploads, set private according to

new convention
---
 build.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index ea3e6b6a72..7213bad017 100755
--- a/build.sh
+++ b/build.sh
@@ -298,7 +298,7 @@ then
     if $build_viewer_deb && [ "$last_built_variant" == "Release" ]
     then
       begin_section "Build Viewer Debian Package"
-      have_private_repo=false
+
       # mangle the changelog
       dch --force-bad-version \
           --distribution unstable \
@@ -328,11 +328,12 @@ then
       # upload debian package and create repository
       begin_section "Upload Debian Repository"
       for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
-        upload_output "deb" $deb_file binary/octet-stream
+        deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
+        upload_output "debian $deb_pkg" $deb_file binary/octet-stream
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
-        upload_output debian $deb_file binary/octet-stream
-        have_private_repo=true
+        deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
+        upload_output "debian $deb_pkg" $deb_file binary/octet-stream private
       done
 
       create_deb_repo
-- 
cgit v1.2.3


From 9d5bf8df82d6171d2a9957f33ea6e43120d31cef Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Sep 2016 11:34:10 -0400
Subject: directly invoke codeticket for output

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 7213bad017..f5296b9ea1 100755
--- a/build.sh
+++ b/build.sh
@@ -246,7 +246,7 @@ do
               if [ -r "$build_dir/autobuild-package.xml" ]
               then
                   begin_section "Autobuild metadata"
-                  upload_output "autobuild metadata" "$build_dir/autobuild-package.xml" text/xml
+                  python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml --display
                   if [ "$arch" != "Linux" ]
                   then
                       record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
@@ -262,12 +262,12 @@ do
               if [ -r "$build_dir/doxygen_warnings.log" ]
               then
                   record_event "Doxygen warnings generated; see doxygen_warnings.log"
-                  upload_output "doxygen log" "$build_dir/doxygen_warnings.log" text/plain ## TBD
+                  python_cmd "$helpers/codeticket.py" output --label "doxygen log" --output "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD
               fi
               if [ -d "$build_dir/doxygen/html" ]
               then
                   tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  upload_output "doxygen" "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
+                  python_cmd "$helpers/codeticket.py" output --label "doxygen" --output "$build_dir/viewer-doxygen.tar.bz2"
               fi
               ;;
             *)
@@ -329,11 +329,11 @@ then
       begin_section "Upload Debian Repository"
       for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
         deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
-        upload_output "debian $deb_pkg" $deb_file binary/octet-stream
+        python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output $deb_file
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
         deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
-        upload_output "debian $deb_pkg" $deb_file binary/octet-stream private
+        python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output "$deb_file" --private
       done
 
       create_deb_repo
@@ -369,9 +369,9 @@ then
       succeeded=$build_coverity
     else
       # Upload base package.
-      upload_output installer "$package" binary/octet-stream
+      python_cmd "$helpers/codeticket.py" output --label installer --output "$package" 
 
-      [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json display
+      [ -f $build_dir/summary.json ] && python_cmd "$helpers/codeticket.py" output --label "installer metadata" --output $build_dir/summary.json --mimetype application/json --display
 
       # Upload additional packages.
       for package_id in $additional_packages
@@ -379,7 +379,7 @@ then
         package=$(installer_$arch "$package_id")
         if [ x"$package" != x ]
         then
-          upload_output "installer $package_id" "$package" binary/octet-stream private
+          python_cmd "$helpers/codeticket.py" output --label "installer $package_id" --output "$package" --private
         else
           record_failure "Failed to find additional package for '$package_id'."
         fi
@@ -390,7 +390,7 @@ then
         # Upload crash reporter files
         for symbolfile in $symbolfiles
         do
-          upload_output symbolfile "$build_dir/$symbolfile" binary/octet-stream
+          python_cmd "$helpers/codeticket.py" output --label symbolfile "$build_dir/$symbolfile"
         done
 
         # Upload the llphysicsextensions_tpv package, if one was produced
@@ -398,7 +398,7 @@ then
         if [ -r "$build_dir/llphysicsextensions_package" ]
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-            upload_output "llphysicsextensions_package" "$llphysicsextensions_package" binary/octet-stream private
+            python_cmd "$helpers/codeticket.py" output --label "llphysicsextensions_package" --output "$llphysicsextensions_package" --private
         fi
         ;;
       *)
-- 
cgit v1.2.3


From 65a7a02d296a97257f40c747c1299cbd2616b9ce Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Sep 2016 11:49:52 -0400
Subject: pass autobuild-package.xml to graph generator

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index f5296b9ea1..1edf584b1f 100755
--- a/build.sh
+++ b/build.sh
@@ -249,7 +249,7 @@ do
                   python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml --display
                   if [ "$arch" != "Linux" ]
                   then
-                      record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
+                      record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh
                   else
                       record_event "TBD - no dependency graph for linux (probable python version dependency)"
                   fi
-- 
cgit v1.2.3


From a388504ed2fb8f6c28f33b0e120e2632f693ec14 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Sep 2016 13:32:49 -0400
Subject: fix symbolfile upload

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1edf584b1f..6a1b4813a7 100755
--- a/build.sh
+++ b/build.sh
@@ -390,7 +390,7 @@ then
         # Upload crash reporter files
         for symbolfile in $symbolfiles
         do
-          python_cmd "$helpers/codeticket.py" output --label symbolfile "$build_dir/$symbolfile"
+          python_cmd "$helpers/codeticket.py" output --label symbolfile --output "$build_dir/$symbolfile"
         done
 
         # Upload the llphysicsextensions_tpv package, if one was produced
-- 
cgit v1.2.3


From e2855de8bce3b3b38df13d74e7bba87a61f1a241 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Sep 2016 13:33:10 -0400
Subject: do not display the autobuild package data

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 6a1b4813a7..9fc3bc4503 100755
--- a/build.sh
+++ b/build.sh
@@ -246,7 +246,7 @@ do
               if [ -r "$build_dir/autobuild-package.xml" ]
               then
                   begin_section "Autobuild metadata"
-                  python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml --display
+                  python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml
                   if [ "$arch" != "Linux" ]
                   then
                       record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh
-- 
cgit v1.2.3


From 3e16c29edcfea7542e23ec6066882c5264029bb6 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Sep 2016 13:57:34 -0400
Subject: don't upload summary.json

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 9fc3bc4503..4f30fc64fb 100755
--- a/build.sh
+++ b/build.sh
@@ -371,8 +371,6 @@ then
       # Upload base package.
       python_cmd "$helpers/codeticket.py" output --label installer --output "$package" 
 
-      [ -f $build_dir/summary.json ] && python_cmd "$helpers/codeticket.py" output --label "installer metadata" --output $build_dir/summary.json --mimetype application/json --display
-
       # Upload additional packages.
       for package_id in $additional_packages
       do
-- 
cgit v1.2.3


From 0c60dea99e882dc8af94151951a7f6f7d593aecb Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 20 Sep 2016 14:31:38 -0400
Subject: update calls to new codeticket

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 4f30fc64fb..30632a9df3 100755
--- a/build.sh
+++ b/build.sh
@@ -209,7 +209,7 @@ then
 fi
 
 initialize_context
-codeticket addinput parameter "viewer_channel" "${viewer_channel}"
+python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}"
 initialize_build
 
 # Now run the build
@@ -246,7 +246,7 @@ do
               if [ -r "$build_dir/autobuild-package.xml" ]
               then
                   begin_section "Autobuild metadata"
-                  python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml
+                  python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml
                   if [ "$arch" != "Linux" ]
                   then
                       record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh
@@ -262,12 +262,12 @@ do
               if [ -r "$build_dir/doxygen_warnings.log" ]
               then
                   record_event "Doxygen warnings generated; see doxygen_warnings.log"
-                  python_cmd "$helpers/codeticket.py" output --label "doxygen log" --output "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD
+                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Log" "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD
               fi
               if [ -d "$build_dir/doxygen/html" ]
               then
                   tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  python_cmd "$helpers/codeticket.py" output --label "doxygen" --output "$build_dir/viewer-doxygen.tar.bz2"
+                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2"
               fi
               ;;
             *)
@@ -329,11 +329,11 @@ then
       begin_section "Upload Debian Repository"
       for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
         deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
-        python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output $deb_file
+        python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" $deb_file
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
         deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
-        python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output "$deb_file" --private
+        python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" "$deb_file" --private
       done
 
       create_deb_repo
@@ -369,7 +369,7 @@ then
       succeeded=$build_coverity
     else
       # Upload base package.
-      python_cmd "$helpers/codeticket.py" output --label installer --output "$package" 
+      python_cmd "$helpers/codeticket.py" addoutput Installer --output "$package" 
 
       # Upload additional packages.
       for package_id in $additional_packages
@@ -377,7 +377,7 @@ then
         package=$(installer_$arch "$package_id")
         if [ x"$package" != x ]
         then
-          python_cmd "$helpers/codeticket.py" output --label "installer $package_id" --output "$package" --private
+          python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package"
         else
           record_failure "Failed to find additional package for '$package_id'."
         fi
@@ -388,7 +388,7 @@ then
         # Upload crash reporter files
         for symbolfile in $symbolfiles
         do
-          python_cmd "$helpers/codeticket.py" output --label symbolfile --output "$build_dir/$symbolfile"
+          python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $(basename "$build_dir/$symbolfile")" "$build_dir/$symbolfile"
         done
 
         # Upload the llphysicsextensions_tpv package, if one was produced
@@ -396,7 +396,7 @@ then
         if [ -r "$build_dir/llphysicsextensions_package" ]
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-            python_cmd "$helpers/codeticket.py" output --label "llphysicsextensions_package" --output "$llphysicsextensions_package" --private
+            python_cmd "$helpers/codeticket.py" addoutput "llphysicsextensions_package" "$llphysicsextensions_package" --private
         fi
         ;;
       *)
-- 
cgit v1.2.3


From 6bd8aac928898f1744fd41d972c59dd864351cbc Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 23 Sep 2016 17:21:03 -0400
Subject: adjust initialization function names to the new terminology

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 30632a9df3..b7afdcd7f3 100755
--- a/build.sh
+++ b/build.sh
@@ -208,9 +208,9 @@ then
     export additional_packages=
 fi
 
-initialize_context
-python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}"
 initialize_build
+python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}"
+initialize_version
 
 # Now run the build
 succeeded=true
@@ -396,7 +396,7 @@ then
         if [ -r "$build_dir/llphysicsextensions_package" ]
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-            python_cmd "$helpers/codeticket.py" addoutput "llphysicsextensions_package" "$llphysicsextensions_package" --private
+            python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private
         fi
         ;;
       *)
-- 
cgit v1.2.3


From ea11d577c124702505f4d10afdfc86e299019e25 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sat, 3 Dec 2016 10:49:43 -0500
Subject: call standard initialization functions from buildscripts build.sh

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index ab7a1faa37..270775ab48 100755
--- a/build.sh
+++ b/build.sh
@@ -176,6 +176,8 @@ then
     exit 1
 fi
 
+initialize_build # provided by master buildscripts build.sh
+
 # Check to see if we're skipping the platform
 if ! eval '$build_'"$arch"
 then
@@ -208,6 +210,8 @@ begin_section "Environment"
 env|sort
 end_section "Environment"
 
+initialize_version # provided by buildscripts build.sh; sets version id
+
 # Now run the build
 succeeded=true
 build_processes=
-- 
cgit v1.2.3


From fad899fe6c61e40dec98f38a26d0ed544b2f6b39 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 5 Dec 2016 10:14:18 -0500
Subject: correct merge duplications, put source_environment commands into
 sections

---
 build.sh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 15bbe19f66..36ae33ef90 100755
--- a/build.sh
+++ b/build.sh
@@ -182,13 +182,6 @@ fi
 
 initialize_build # provided by master buildscripts build.sh
 
-# Check to see if we're skipping the platform
-if ! eval '$build_'"$arch"
-then
-    record_event "building on architecture $arch is disabled"
-    pass
-fi
-
 begin_section "autobuild initialize"
 # ensure AUTOBUILD is in native path form for child processes
 AUTOBUILD="$(native_path "$AUTOBUILD")"
@@ -201,7 +194,15 @@ then
 fi
 
 # load autobuild provided shell functions and variables
-eval "$("$autobuild" --quiet source_environment)"
+"$autobuild" --quiet source_environment > "$build_log_dir/source_environment"
+begin_section "dump source environment commands"
+cat "$build_log_dir/source_environment"
+end_section "dump source environment commands"
+
+begin_section "execute source environment commands"
+. "$build_log_dir/source_environment"
+end_section "execute source environment commands"
+
 end_section "autobuild initialize"
 
 # something about the additional_packages mechanism messes up buildscripts results.py on Linux
@@ -211,9 +212,7 @@ then
     export additional_packages=
 fi
 
-initialize_build
 python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}"
-initialize_version
 
 initialize_version # provided by buildscripts build.sh; sets version id
 
-- 
cgit v1.2.3


From 83209ef5c082405e3866d50c4188afd5cfaa7358 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 5 Dec 2016 13:28:40 -0500
Subject: remove more bits of the old build system

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 36ae33ef90..e191794ba0 100755
--- a/build.sh
+++ b/build.sh
@@ -222,9 +222,6 @@ build_processes=
 last_built_variant=
 for variant in $variants
 do
-  eval '$build_'"$variant" || continue
-  eval '$build_'"$arch"_"$variant" || continue
-
   # Only the last built arch is available for upload
   last_built_variant="$variant"
 
-- 
cgit v1.2.3


From c89c1e5f612e9f688aa3094ed0a7998d191b0256 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Dec 2016 14:09:20 -0500
Subject: correct paths for building llphysicsextensions_tpv package

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index e191794ba0..20828597a6 100755
--- a/build.sh
+++ b/build.sh
@@ -114,18 +114,17 @@ package_llphysicsextensions_tpv()
   tpv_status=0
   if [ "$variant" = "Release" ]
   then 
-      llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml
-      "$autobuild" build --quiet --config-file $llpetpvcfg -c Tpv
+      tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml")
+      "$autobuild" build --quiet --config-file "$tpvconfig" -c Tpv || fatal "failed to build llphysicsextensions_tpv"
       
       # capture the package file name for use in upload later...
       PKGTMP=`mktemp -t pgktpv.XXXXXX`
       trap "rm $PKGTMP* 2>/dev/null" 0
-      "$autobuild" package --quiet --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
+      "$autobuild" package --quiet --config-file "$tpvconfig" --results-file "$(native_path $PKGTMP)" || fatal "failed to package llphysicsextensions_tpv"
       tpv_status=$?
       if [ -r "${PKGTMP}" ]
       then
-          cat "${PKGTMP}" >> "$build_log"
-          eval $(cat "${PKGTMP}") # sets autobuild_package_{name,filename,md5}
+          . "${PKGTMP}" # sets autobuild_package_{name,filename,md5}
           autobuild_package_filename="$(shell_path "${autobuild_package_filename}")"
           echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package
       fi
-- 
cgit v1.2.3


From 54f1f81d5ae651aef932afd81c09ede9c191b2cc Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Dec 2016 18:22:34 -0500
Subject: comment out building the tpv distro for llphysicsextensions to
 unblock others

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 20828597a6..558d74c4d5 100755
--- a/build.sh
+++ b/build.sh
@@ -159,7 +159,8 @@ build()
     fi
 
     # *TODO: Make this a build extension.
-    package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
+    # HACK: remove this temporarily to unblock viewer64 builds for others
+    # package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
     end_section "extensions $variant"
 
   else
-- 
cgit v1.2.3


From 7b3ff5418e828fe077ce03bcfd866eede91467c0 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 7 Dec 2016 19:58:01 -0500
Subject: make build.sh use the same build directory that autobuild.xml uses on
 Windows

---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 558d74c4d5..0880732a4f 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ build_dir_Linux()
 
 build_dir_CYGWIN()
 {
-  echo build-vc120
+  echo build-vc120-${AUTOBUILD_ADDRSIZE}
 }
 
 viewer_channel_suffix()
@@ -114,6 +114,7 @@ package_llphysicsextensions_tpv()
   tpv_status=0
   if [ "$variant" = "Release" ]
   then 
+      test -r  "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml" || fatal "No llphysicsextensions_tpv autobuild configuration found"
       tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml")
       "$autobuild" build --quiet --config-file "$tpvconfig" -c Tpv || fatal "failed to build llphysicsextensions_tpv"
       
@@ -159,8 +160,7 @@ build()
     fi
 
     # *TODO: Make this a build extension.
-    # HACK: remove this temporarily to unblock viewer64 builds for others
-    # package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
+    package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
     end_section "extensions $variant"
 
   else
-- 
cgit v1.2.3


From 7a5fbe8d1ab8ef35105cf3f9fcefd6a2f40be8ce Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 8 Dec 2016 09:35:54 -0500
Subject: correct upload of default installer

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 0880732a4f..b16eedb5ab 100755
--- a/build.sh
+++ b/build.sh
@@ -370,7 +370,7 @@ then
       succeeded=$build_coverity
     else
       # Upload base package.
-      python_cmd "$helpers/codeticket.py" addoutput Installer --output "$package" 
+      python_cmd "$helpers/codeticket.py" addoutput Installer "$package" 
 
       # Upload additional packages.
       for package_id in $additional_packages
-- 
cgit v1.2.3


From c2f70796986424bb7061665f70744a68c887e216 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 8 Dec 2016 09:57:31 -0500
Subject: make all upload failures fatal

---
 build.sh | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index b16eedb5ab..1af66f0cb6 100755
--- a/build.sh
+++ b/build.sh
@@ -247,7 +247,8 @@ do
               if [ -r "$build_dir/autobuild-package.xml" ]
               then
                   begin_section "Autobuild metadata"
-                  python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml
+                  python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml \
+                      || fatal "Upload of autobuild metadata failed"
                   if [ "$arch" != "Linux" ]
                   then
                       record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh
@@ -268,7 +269,8 @@ do
               if [ -d "$build_dir/doxygen/html" ]
               then
                   tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3  "$build_dir/doxygen/html"
-                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2"
+                  python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" \
+                      || fatal "Upload of doxygen tarball failed"
               fi
               ;;
             *)
@@ -330,11 +332,13 @@ then
       begin_section "Upload Debian Repository"
       for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do
         deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
-        python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" $deb_file
+        python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" $deb_file \
+            || fatal "Upload of debian $deb_pkg failed"
       done
       for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do
         deb_pkg=$(basename "$deb_file" | sed 's,_.*,,')
-        python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" "$deb_file" --private
+        python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" "$deb_file" --private \
+            || fatal "Upload of debian $deb_pkg failed"
       done
 
       create_deb_repo
@@ -370,7 +374,8 @@ then
       succeeded=$build_coverity
     else
       # Upload base package.
-      python_cmd "$helpers/codeticket.py" addoutput Installer "$package" 
+      python_cmd "$helpers/codeticket.py" addoutput Installer "$package"  \
+          || fatal "Upload of installer failed"
 
       # Upload additional packages.
       for package_id in $additional_packages
@@ -378,7 +383,8 @@ then
         package=$(installer_$arch "$package_id")
         if [ x"$package" != x ]
         then
-          python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package"
+          python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" \
+              || fatal "Upload of installer $package_id failed"
         else
           record_failure "Failed to find additional package for '$package_id'."
         fi
@@ -389,7 +395,9 @@ then
         # Upload crash reporter files
         for symbolfile in $symbolfiles
         do
-          python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $(basename "$build_dir/$symbolfile")" "$build_dir/$symbolfile"
+          symfile=$(basename "$build_dir/$symbolfile")
+          python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $symfile" "$build_dir/$symbolfile" \
+              || fatal "Upload of symbolfile $symfile failed"
         done
 
         # Upload the llphysicsextensions_tpv package, if one was produced
@@ -397,7 +405,8 @@ then
         if [ -r "$build_dir/llphysicsextensions_package" ]
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-            python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private
+            python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private \
+                || fatal "Upload of physics extensions package failed"
         fi
         ;;
       *)
-- 
cgit v1.2.3


From 6976377aa141ac51cd7d98fa80d34866f9f7b611 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 8 Dec 2016 10:11:58 -0500
Subject: use native paths for llphysicsextensions_package file name

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1af66f0cb6..5502fc28b1 100755
--- a/build.sh
+++ b/build.sh
@@ -126,7 +126,6 @@ package_llphysicsextensions_tpv()
       if [ -r "${PKGTMP}" ]
       then
           . "${PKGTMP}" # sets autobuild_package_{name,filename,md5}
-          autobuild_package_filename="$(shell_path "${autobuild_package_filename}")"
           echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package
       fi
   else
-- 
cgit v1.2.3


From e6513c1eee4800b41fbdd0c45b7bfca38601a884 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 8 Dec 2016 12:31:30 -0500
Subject: DRTVWR-418: Change Mac build_directory to build-darwin-x86_64 since
 we no longer support 32-bit Mac builds.

The old build-darwin-i386 directory name appeared in a shocking number of
files. Change CMake paths to use ${CMAKE_BINARY_DIR} -- or, when trying to
find the packages subdirectory, ${AUTOBUILD_INSTALL_DIR}. Change the rest to
at least look for build-darwin-*.
---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 0880732a4f..c1a151538e 100755
--- a/build.sh
+++ b/build.sh
@@ -18,7 +18,7 @@
 
 build_dir_Darwin()
 {
-  echo build-darwin-i386
+  echo build-darwin-x86_64
 }
 
 build_dir_Linux()
-- 
cgit v1.2.3


From 09b88cf4afee0c673671fe36636b1766296570e5 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 9 Dec 2016 08:12:15 -0500
Subject: add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output
 tag to just "Symbolfile"

---
 build.sh | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 5502fc28b1..d1a438c1a9 100755
--- a/build.sh
+++ b/build.sh
@@ -389,28 +389,33 @@ then
         fi
       done
 
-      case "$last_built_variant" in
-      Release)
-        # Upload crash reporter files
-        for symbolfile in $symbolfiles
-        do
-          symfile=$(basename "$build_dir/$symbolfile")
-          python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $symfile" "$build_dir/$symbolfile" \
-              || fatal "Upload of symbolfile $symfile failed"
-        done
-
-        # Upload the llphysicsextensions_tpv package, if one was produced
-        # *TODO: Make this an upload-extension
-        if [ -r "$build_dir/llphysicsextensions_package" ]
-        then
-            llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
-            python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private \
-                || fatal "Upload of physics extensions package failed"
-        fi
-        ;;
-      *)
-        ;;
-      esac
+      if [ "$last_built_variant" = "Release" ]
+      then
+          # Upload crash reporter file
+          # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt
+          case "$arch" in
+              CYGWIN)
+                  symbolfile="$build_dir/newview/Release/secondlife-symbols-windows-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+                  ;;
+              Darwin)
+                  symbolfile="$build_dir/newview/Release/secondlife-symbols-darwin-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+                  ;;
+              Linux)
+                  symbolfile="$build_dir/newview/Release/secondlife-symbols-linux-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+                  ;;
+          esac
+          python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$symbolfile" \
+              || fatal "Upload of symbolfile failed"
+
+          # Upload the llphysicsextensions_tpv package, if one was produced
+          # *TODO: Make this an upload-extension
+          if [ -r "$build_dir/llphysicsextensions_package" ]
+          then
+              llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
+              python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private \
+                  || fatal "Upload of physics extensions package failed"
+          fi
+      fi
 
       # Run upload extensions
       if [ -d ${build_dir}/packages/upload-extensions ]; then
-- 
cgit v1.2.3


From 7a83f26323b192b09b4017b5f4f986511345bd36 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 21 Dec 2016 19:11:58 -0500
Subject: DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py.

---
 build.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 5c48b902d4..0b9b644cda 100755
--- a/build.sh
+++ b/build.sh
@@ -95,10 +95,17 @@ 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"
 
+    # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we
+    # figure out why it's breaking.
+    if [ "$arch" == "Darwin" ]
+    then RELEASE_CRASH_REPORTING=OFF
+    else RELEASE_CRASH_REPORTING=ON
+    fi
+
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
      -DUNATTENDED:BOOL=ON \
-     -DRELEASE_CRASH_REPORTING:BOOL=ON \
+     -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
-- 
cgit v1.2.3


From aa2aa5e2da896a4ab96da41b878eb39e0dde8f35 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 21 Dec 2016 20:51:18 -0500
Subject: DRTVWR-418: Migrate HAVOK suppression from autobuild.xml to build.sh.

Turns out that without HAVOK, we can't build the PhysicsExtensions_TPV; but
the viewer's build.sh is unaware of CMake switches set in autobuild.xml.
Passing those CMake overrides in build.sh allows us to test that setting
elsewhere in build.sh to skip the PhysicsExtensions_TPV step -- instead of
failing the build.
---
 build.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 0b9b644cda..f826432d93 100755
--- a/build.sh
+++ b/build.sh
@@ -95,16 +95,20 @@ 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"
 
+    # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build.
     # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we
     # figure out why it's breaking.
     if [ "$arch" == "Darwin" ]
-    then RELEASE_CRASH_REPORTING=OFF
-    else RELEASE_CRASH_REPORTING=ON
+    then HAVOK=OFF
+         RELEASE_CRASH_REPORTING=OFF
+    else HAVOK=ON
+         RELEASE_CRASH_REPORTING=ON
     fi
 
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
      -DUNATTENDED:BOOL=ON \
+     -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
      -DGRID:STRING="\"$viewer_grid\"" \
@@ -119,7 +123,8 @@ package_llphysicsextensions_tpv()
 {
   begin_section "PhysicsExtensions_TPV"
   tpv_status=0
-  if [ "$variant" = "Release" ]
+  # nat 2016-12-21: without HAVOK, can't build PhysicsExtensions_TPV.
+  if [ "$variant" = "Release" -a "${HAVOK:-}" != "OFF" ]
   then 
       test -r  "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml" || fatal "No llphysicsextensions_tpv autobuild configuration found"
       tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml")
-- 
cgit v1.2.3


From e9f5ed6591fb5d2513b5065622b9e7dac6737913 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 22 Dec 2016 10:18:48 -0500
Subject: fix installer name function for Mac (and maybe Linux?)

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index f826432d93..7d0a961486 100755
--- a/build.sh
+++ b/build.sh
@@ -47,8 +47,8 @@ viewer_channel_suffix()
 installer_Darwin()
 {
   local package_name="$1"
-  local package_dir="$(build_dir_Darwin ${last_built_variant:-Release})/newview/"
-  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i386\\.dmg\$"
+  local package_dir="newview/$(build_dir_Darwin ${last_built_variant:-Release})/"
+  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
   # even if someone makes a qualified name that duplicates the last word of the base name
@@ -59,7 +59,7 @@ installer_Darwin()
 installer_Linux()
 {
   local package_name="$1"
-  local package_dir="$(build_dir_Linux ${last_built_variant:-Release})/newview/"
+  local package_dir="newview/$(build_dir_Linux ${last_built_variant:-Release})/"
   local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
@@ -381,7 +381,7 @@ then
     package=$(installer_$arch)
     if [ x"$package" = x ] || test -d "$package"
     then
-      record_event "??? mystery event $package // $build_coverity"
+      fatal "No installer found at '$package'"
       succeeded=$build_coverity
     else
       # Upload base package.
-- 
cgit v1.2.3


From 6ef555414dedca9db915ef71c320ed53090b1e8e Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 22 Dec 2016 11:50:33 -0500
Subject: try again to actually fix the installer name function for Mac (and
 maybe Linux?)

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 7d0a961486..7efe6e3492 100755
--- a/build.sh
+++ b/build.sh
@@ -47,7 +47,8 @@ viewer_channel_suffix()
 installer_Darwin()
 {
   local package_name="$1"
-  local package_dir="newview/$(build_dir_Darwin ${last_built_variant:-Release})/"
+  local variant=${last_built_variant:-Release}
+  local package_dir="$(build_dir_Darwin)/newview/${variant}/"
   local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
@@ -59,7 +60,8 @@ installer_Darwin()
 installer_Linux()
 {
   local package_name="$1"
-  local package_dir="newview/$(build_dir_Linux ${last_built_variant:-Release})/"
+  local variant=${last_built_variant:-Release}
+  local package_dir="$(build_dir_Linux)/newview/${variant}/"
   local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
-- 
cgit v1.2.3


From 0131e8a0815826bda538908991d28e23624c0754 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 22 Dec 2016 13:54:39 -0500
Subject: one more try... also fixing setting of viewer_channel without quotes

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 7efe6e3492..130c620d23 100755
--- a/build.sh
+++ b/build.sh
@@ -47,8 +47,7 @@ viewer_channel_suffix()
 installer_Darwin()
 {
   local package_name="$1"
-  local variant=${last_built_variant:-Release}
-  local package_dir="$(build_dir_Darwin)/newview/${variant}/"
+  local package_dir="$(build_dir_Darwin)/newview/"
   local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
@@ -60,8 +59,7 @@ installer_Darwin()
 installer_Linux()
 {
   local package_name="$1"
-  local variant=${last_built_variant:-Release}
-  local package_dir="$(build_dir_Linux)/newview/${variant}/"
+  local package_dir="$(build_dir_Linux)/newview/"
   local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
@@ -112,7 +110,7 @@ pre_build()
      -DUNATTENDED:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
-     -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
+     -DVIEWER_CHANNEL:STRING="${viewer_channel}" \
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
@@ -383,7 +381,7 @@ then
     package=$(installer_$arch)
     if [ x"$package" = x ] || test -d "$package"
     then
-      fatal "No installer found at '$package'"
+      fatal "No installer found from `pwd`"
       succeeded=$build_coverity
     else
       # Upload base package.
-- 
cgit v1.2.3


From eaeadf71e00ae8381ca3d68ece5f87a31fa8c46e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 22 Dec 2016 15:11:37 -0500
Subject: DRTVWR-418: If we don't produce a symbol file, don't try to upload
 it.

---
 build.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 7efe6e3492..5639c93f40 100755
--- a/build.sh
+++ b/build.sh
@@ -405,21 +405,25 @@ then
 
       if [ "$last_built_variant" = "Release" ]
       then
-          # Upload crash reporter file
-          # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt
-          case "$arch" in
-              CYGWIN)
-                  symbolfile="$build_dir/newview/Release/secondlife-symbols-windows-${AUTOBUILD_ADDRSIZE}.tar.bz2"
-                  ;;
-              Darwin)
-                  symbolfile="$build_dir/newview/Release/secondlife-symbols-darwin-${AUTOBUILD_ADDRSIZE}.tar.bz2"
-                  ;;
-              Linux)
-                  symbolfile="$build_dir/newview/Release/secondlife-symbols-linux-${AUTOBUILD_ADDRSIZE}.tar.bz2"
-                  ;;
-          esac
-          python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$symbolfile" \
-              || fatal "Upload of symbolfile failed"
+          # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
+          if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
+          then
+              # Upload crash reporter file
+              # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt
+              case "$arch" in
+                  CYGWIN)
+                      symbolfile="$build_dir/newview/Release/secondlife-symbols-windows-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+                      ;;
+                  Darwin)
+                      symbolfile="$build_dir/newview/Release/secondlife-symbols-darwin-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+                      ;;
+                  Linux)
+                      symbolfile="$build_dir/newview/Release/secondlife-symbols-linux-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+                      ;;
+              esac
+              python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$symbolfile" \
+                  || fatal "Upload of symbolfile failed"
+          fi
 
           # Upload the llphysicsextensions_tpv package, if one was produced
           # *TODO: Make this an upload-extension
-- 
cgit v1.2.3


From 8b4022f041c0ae726894e09460fa5358495a8a0f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 4 Jan 2017 09:27:36 -0500
Subject: DRTVWR-418: Consume autobuild_configure_parameters in build.sh.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 531be4f81d..ee59892908 100755
--- a/build.sh
+++ b/build.sh
@@ -114,6 +114,7 @@ pre_build()
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
+     $autobuild_configure_parameters \
     || fatal "$variant configuration failed"
 
   end_section "Configure $variant"
-- 
cgit v1.2.3


From 052900045255ce903f081fd8b3d0f619f34df087 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 4 Jan 2017 14:15:54 -0500
Subject: DRTVWR-418: Set signing CMake switches in build.sh for proper
 quoting.

---
 build.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index ee59892908..5d774fe7e5 100755
--- a/build.sh
+++ b/build.sh
@@ -98,9 +98,14 @@ pre_build()
     # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build.
     # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we
     # figure out why it's breaking.
+    SIGNING=()
     if [ "$arch" == "Darwin" ]
     then HAVOK=OFF
          RELEASE_CRASH_REPORTING=OFF
+         if [ "$variant" == "Release" ]
+         then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
+                       "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
+         fi
     else HAVOK=ON
          RELEASE_CRASH_REPORTING=ON
     fi
@@ -114,7 +119,7 @@ pre_build()
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
-     $autobuild_configure_parameters \
+     "${SIGNING[@]}"
     || fatal "$variant configuration failed"
 
   end_section "Configure $variant"
-- 
cgit v1.2.3


From 85438e6725c70ce8498dd16bf3afc265470ec983 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 4 Jan 2017 15:27:31 -0500
Subject: DRTVWR-418: Fix line-break problem; also explicitly request bash.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 5d774fe7e5..718a36cd93 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # This is the custom build script for the viewer
 #
@@ -119,7 +119,7 @@ pre_build()
      -DGRID:STRING="\"$viewer_grid\"" \
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
-     "${SIGNING[@]}"
+     "${SIGNING[@]}" \
     || fatal "$variant configuration failed"
 
   end_section "Configure $variant"
-- 
cgit v1.2.3


From f40bd0fac308b21319d84ee221cb8f81d369dd71 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 6 Jan 2017 17:03:35 -0500
Subject: DRTVWR-418, SL-619: Update to google_breakpad build 501824 and
 re-enable breakpad symbol generation.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 718a36cd93..9ca130b5d5 100755
--- a/build.sh
+++ b/build.sh
@@ -96,18 +96,15 @@ pre_build()
     && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg"
 
     # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build.
-    # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we
-    # figure out why it's breaking.
+    RELEASE_CRASH_REPORTING=ON
     SIGNING=()
     if [ "$arch" == "Darwin" ]
     then HAVOK=OFF
-         RELEASE_CRASH_REPORTING=OFF
          if [ "$variant" == "Release" ]
          then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
                        "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
          fi
     else HAVOK=ON
-         RELEASE_CRASH_REPORTING=ON
     fi
 
     "$autobuild" configure --quiet -c $variant -- \
-- 
cgit v1.2.3