From 809c0575bce07ae408fba1e047a420a3ac1c9c65 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 29 Nov 2016 16:22:06 -0500
Subject: DRTVWR-418: Add viewer-build-variables to BuildParams

---
 BuildParams | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index 09cc06e83a..5adf249269 100755
--- a/BuildParams
+++ b/BuildParams
@@ -34,6 +34,10 @@ Linux.distcc_version =
 Linux.gcc_version = /usr/bin/gcc-4.6
 Linux.cxx_version = /usr/bin/g++-4.6
 
+# Need viewer-build-variables as well as other shared repositories
+buildscripts_shared_more_NAMEs="build_variables"
+build_variables_repostory_url = "https://bitbucket.org/lindenlab/viewer-build-variables"
+
 ################################################################
 ####      Examples of how to set the viewer_channel         ####
 #
-- 
cgit v1.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

---
 BuildParams | 22 +---------------------
 build.sh    |  3 ---
 2 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index 5adf249269..cbd5be7658 100755
--- a/BuildParams
+++ b/BuildParams
@@ -3,7 +3,6 @@
 # Please refer to:
 #  https://wiki.secondlife.com/wiki/Automated_Build_System
 
-
 # Global setting for now....
 Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
 CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
@@ -13,27 +12,9 @@ Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
 public_build = true
 build_docs = true
 
-# disable all Debug builds (RelWithDebInfo is sufficient)
-build_CYGWIN_Debug = false
-build_Linux_Debug = false
-build_Darwin_Debug = false
-build_Debug = false
-
 # enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
 build_Linux_Doxygen = true
 
-# Update Public Inworld Build Status Indicators (setting should mirror "public_build")
-email_status_this_is_os = true
-
-# Limit extent of codeticket updates to revisions after...
-codeticket_since = 3.3.0-release
-
-# Override build system default toolchain
-# Note that this will only affect automated builds.
-Linux.distcc_version = 
-Linux.gcc_version = /usr/bin/gcc-4.6
-Linux.cxx_version = /usr/bin/g++-4.6
-
 # Need viewer-build-variables as well as other shared repositories
 buildscripts_shared_more_NAMEs="build_variables"
 build_variables_repostory_url = "https://bitbucket.org/lindenlab/viewer-build-variables"
@@ -92,5 +73,4 @@ EDU_viewer_channel_suffix = "edu"
 # Notifications - to configure email notices use the TeamCity parameter
 # setting screen for your project or build configuration to set the
 # environment variable 'email' to a space-separated list of email addresses
-
-
+email=""
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.3


From 8a67aaa009f99b858e750433cfbd7901341afad8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 5 Dec 2016 15:20:08 -0500
Subject: limit variants to RelWithDebInfo and Release

---
 BuildParams | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index cbd5be7658..a991781c58 100755
--- a/BuildParams
+++ b/BuildParams
@@ -3,10 +3,8 @@
 # Please refer to:
 #  https://wiki.secondlife.com/wiki/Automated_Build_System
 
-# Global setting for now....
-Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
-CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
-Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
+# Variants (NOTE: 'Release' must be last for uploads to work correctly)
+variants = "RelWithDebInfo Release"
 
 # Use Public Upload Locations
 public_build = true
@@ -74,3 +72,8 @@ EDU_viewer_channel_suffix = "edu"
 # setting screen for your project or build configuration to set the
 # environment variable 'email' to a space-separated list of email addresses
 email=""
+
+# Global setting for now....
+Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
+CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
+Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
-- 
cgit v1.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"

---
 BuildParams                  |  4 ----
 build.sh                     | 49 ++++++++++++++++++++++++--------------------
 indra/newview/CMakeLists.txt |  7 ++++---
 3 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index a991781c58..789c7925bd 100755
--- a/BuildParams
+++ b/BuildParams
@@ -73,7 +73,3 @@ EDU_viewer_channel_suffix = "edu"
 # environment variable 'email' to a space-separated list of email addresses
 email=""
 
-# Global setting for now....
-Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
-CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
-Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
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
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 45ba8d6eb7..26e56d0119 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2109,9 +2109,10 @@ endif (INSTALL)
 
 if (PACKAGE)
   set(SYMBOL_SEARCH_DIRS "")
+  # Note that the path to VIEWER_SYMBOL_FILE must match that in ../../build.sh
   if (WINDOWS)
     list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
-    set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-windows.tar.bz2")
+    set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-windows-$ENV{AUTOBUILD_ADDRSIZE}.tar.bz2")
     # slplugin.exe failing symbols dump - need to debug, might have to do with updated version of google breakpad
     # set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX} slplugin.exe")
     set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
@@ -2125,14 +2126,14 @@ if (PACKAGE)
     list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/mac_crash_logger/${CMAKE_CFG_INTDIR}")
     list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/media_plugins/gstreamer010/${CMAKE_CFG_INTDIR}")
     list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_BINARY_DIR}/media_plugins/quicktime/${CMAKE_CFG_INTDIR}")
-    set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-darwin.tar.bz2")
+    set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-darwin-$ENV{AUTOBUILD_ADDRSIZE}.tar.bz2")
     set(VIEWER_EXE_GLOBS "'Second Life' SLPlugin mac-crash-logger")
     set(VIEWER_EXE_GLOBS "'Second Life' mac-crash-logger")
     set(VIEWER_LIB_GLOB "*.dylib")
   endif (DARWIN)
   if (LINUX)
     list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/packaged")
-    set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-linux.tar.bz2")
+    set(VIEWER_SYMBOL_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/secondlife-symbols-linux-$ENV{AUTOBUILD_ADDRSIZE}.tar.bz2")
     set(VIEWER_EXE_GLOBS "do-not-directly-run-secondlife-bin SLPlugin")
     set(VIEWER_EXE_GLOBS "do-not-directly-run-secondlife-bin")
     set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}*")
-- 
cgit v1.3


From d0e166fe8a803967bac081c9f6ac73e436a684f5 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 13 Dec 2016 15:30:51 -0500
Subject: DRTVWR-418: Remove build_variables_repository_url from BuildParams.

That should be set in TeamCity template hierarchy; don't override it.
---
 BuildParams | 1 -
 1 file changed, 1 deletion(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index a991781c58..f1886077e3 100755
--- a/BuildParams
+++ b/BuildParams
@@ -15,7 +15,6 @@ build_Linux_Doxygen = true
 
 # Need viewer-build-variables as well as other shared repositories
 buildscripts_shared_more_NAMEs="build_variables"
-build_variables_repostory_url = "https://bitbucket.org/lindenlab/viewer-build-variables"
 
 ################################################################
 ####      Examples of how to set the viewer_channel         ####
-- 
cgit v1.3


From c8358e7b631952c945c964bf53866c44405a0741 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 20 Dec 2017 15:11:30 -0500
Subject: require build_secrets (removed from the buildscripts requirements)

---
 BuildParams | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index a5edfadbd6..cb908f1532 100755
--- a/BuildParams
+++ b/BuildParams
@@ -14,7 +14,7 @@ build_docs = true
 build_Linux_Doxygen = true
 
 # Need viewer-build-variables as well as other shared repositories
-buildscripts_shared_more_NAMEs="build_variables"
+buildscripts_shared_more_NAMEs="build_secrets build_variables"
 
 ################################################################
 ####      Examples of how to set the viewer_channel         ####
-- 
cgit v1.3