From 63fe7d802aad177107ef8e3bc0c9b7ea5118ad61 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 25 May 2018 12:09:50 -0400
Subject: SL-821, SL-826: Use BUGSPLAT_DB from environment on Windows and Mac.

On TeamCity, set BUGSPLAT_DB from build-secrets.

Use the presence of $BUGSPLAT_DB, rather than a new CMake BUGSPLAT option, to
control whether CMake searches for BugSplat -- and passes LL_BUGSPLAT into C++.

When BUGSPLAT_DB is present, make viewer_manifest.py set "BugSplat DB" in
build_data.json, and "BugsplatServerURL" in Mac Info.plist.

Make llappviewerwin32.cpp read "BugSplat DB" from build_data.json.

Add placeholders for Mac hooks to suppress BugSplat prompt and send
SecondLife.log.
---
 build.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index bb8d66599b..7e44c6fee3 100755
--- a/build.sh
+++ b/build.sh
@@ -95,17 +95,23 @@ 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.
     RELEASE_CRASH_REPORTING=ON
     HAVOK=ON
     SIGNING=()
-    if [ "$arch" == "Darwin" ]
-    then
-         if [ "$variant" == "Release" ]
-         then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
-                       "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
-         fi
+    if [ "$arch" == "Darwin" -a "$variant" == "Release" ]
+    then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
+                  "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
+    fi
+
+    # don't spew credentials into build log
+    bugsplat_sh="$build_secrets_checkout/bugsplat/bugsplat.sh"
+    set +x
+    if [ -r "$bugsplat_sh" ]
+    then # show that we're doing this, just not the contents
+         echo source "$bugsplat_sh"
+         source "$bugsplat_sh"
     fi
+    set -x
 
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
-- 
cgit v1.2.3


From 8781b36d7ee5d6532fb6534caa595166ad00f04d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 25 May 2018 16:08:00 -0400
Subject: SL-821: export BUGSPLAT_DB when loaded so child processes can detect.

Produce CMake message when BugSplat is engaged so we can detect in build log.

Don't try to copy BugSplat DLLs when NOT engaged.
---
 build.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 7e44c6fee3..cf18c3f541 100755
--- a/build.sh
+++ b/build.sh
@@ -110,6 +110,11 @@ pre_build()
     then # show that we're doing this, just not the contents
          echo source "$bugsplat_sh"
          source "$bugsplat_sh"
+         # important: we test this and use its value in [grand-]child processes
+         if [ -n "${BUGSPLAT_DB:-}" ]
+         then echo export BUGSPLAT_DB
+              export BUGSPLAT_DB
+         fi
     fi
     set -x
 
-- 
cgit v1.2.3


From 0fedc97f3f9bb83e93624343072c9b3dd62c63ae Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 30 May 2018 10:32:47 -0400
Subject: always run tests

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index cf18c3f541..1196cb3813 100755
--- a/build.sh
+++ b/build.sh
@@ -125,7 +125,6 @@ pre_build()
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -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 \
      "${SIGNING[@]}" \
     || fatal "$variant configuration failed"
-- 
cgit v1.2.3


From 837ca22924a4fc3ade6d592bc75c7921a6f4e668 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 30 May 2018 10:36:23 -0400
Subject: set shell nullglob option

so that when a glob has no expansion you don't get the glob back (
*.sh expands to empty rather than to "*.sh")
---
 build.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 1196cb3813..b85e254c15 100755
--- a/build.sh
+++ b/build.sh
@@ -204,6 +204,8 @@ then
     exit 1
 fi
 
+shopt -s nullglob # if nothing matches a glob, expand to nothing
+
 initialize_build # provided by master buildscripts build.sh
 
 begin_section "autobuild initialize"
-- 
cgit v1.2.3


From d2fa5a53e8b91bd0aba10ab3917c722dc360b610 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 30 May 2018 13:14:43 -0400
Subject: remove unused UNATTENDED cmake variable that generates warnings

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index b85e254c15..efe96a0a6a 100755
--- a/build.sh
+++ b/build.sh
@@ -120,7 +120,6 @@ pre_build()
 
     "$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}" \
-- 
cgit v1.2.3


From 786f80b9426742f0c9fe964ce54168b7005d92c8 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 14 Jun 2018 19:03:17 -0400
Subject: SL-821: When using BugSplat, don't try to upload Breakpad symbols.

With BugSplat, the Breakpad symbol files aren't generated; attempting to post
them to codeticket will fail the build.
---
 build.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index efe96a0a6a..56ec57818c 100755
--- a/build.sh
+++ b/build.sh
@@ -114,6 +114,8 @@ pre_build()
          if [ -n "${BUGSPLAT_DB:-}" ]
          then echo export BUGSPLAT_DB
               export BUGSPLAT_DB
+              echo RELEASE_CRASH_REPORTING=OFF
+              RELEASE_CRASH_REPORTING=OFF
          fi
     fi
     set -x
-- 
cgit v1.2.3


From f6e7893a6e34190e8080d289a5f89d7f9c47d583 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 28 Jun 2018 12:39:42 -0400
Subject: MAINT-8797: Resurrect BugSplat crash reporting on Windows.

The Breakpad symbol-file upload in the viewer's build.sh was failing on
BugSplat builds since we weren't generating Breakpad symbol files. That upload
was conditional on RELEASE_CRASH_REPORTING, so my first approach was to set
RELEASE_CRASH_REPORTING=OFF for BugSplat builds. Unfortunately that symbol
also propagates down into C++ compiles, and in llappviewerwin32.cpp, both
Breakpad and BugSplat crash reporting is conditional on it. So that change
inadvertently turned off the C++ logic to engage BugSplat.

Stop forcing RELEASE_CRASH_REPORTING=OFF for BugSplat builds. Instead, make
the Breakpad symbol-file upload check the BUGSPLAT_DB variable as well.

Add #pragma messages to llappviewerwin32.cpp so we can detect whether it's
being built for Breakpad or BugSplat or neither.
---
 build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 56ec57818c..d531c0b046 100755
--- a/build.sh
+++ b/build.sh
@@ -114,8 +114,6 @@ pre_build()
          if [ -n "${BUGSPLAT_DB:-}" ]
          then echo export BUGSPLAT_DB
               export BUGSPLAT_DB
-              echo RELEASE_CRASH_REPORTING=OFF
-              RELEASE_CRASH_REPORTING=OFF
          fi
     fi
     set -x
@@ -428,7 +426,9 @@ then
       if [ "$last_built_variant" = "Release" ]
       then
           # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
-          if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
+          # Likewise, BUGSPLAT_DB suppresses generating the symbol file.
+          if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" \
+               -a -z "${BUGSPLAT_DB:-}" ]
           then
               # Upload crash reporter file
               # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt
-- 
cgit v1.2.3


From f1eb3c1b63b97de2a91c967e5c66f7b25c4963a2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 18 Jul 2018 20:32:35 -0400
Subject: DRTVWR-447: Temporarily suppress building for BugSplat on Mac.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index d531c0b046..216ce5720a 100755
--- a/build.sh
+++ b/build.sh
@@ -106,7 +106,8 @@ pre_build()
     # don't spew credentials into build log
     bugsplat_sh="$build_secrets_checkout/bugsplat/bugsplat.sh"
     set +x
-    if [ -r "$bugsplat_sh" ]
+    # HACK: Suppress for Mac until BugSplat fixes the Mac client API
+    if [ -r "$bugsplat_sh" -a "$arch" != "Darwin" ]
     then # show that we're doing this, just not the contents
          echo source "$bugsplat_sh"
          source "$bugsplat_sh"
-- 
cgit v1.2.3


From 3ca8263fb462bb0aba23b8d27d717a961db5bad6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 15 Aug 2018 16:12:56 -0400
Subject: Backed out changeset 25b55601514d: re-enable building BugSplat on
 Mac.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 216ce5720a..d531c0b046 100755
--- a/build.sh
+++ b/build.sh
@@ -106,8 +106,7 @@ pre_build()
     # don't spew credentials into build log
     bugsplat_sh="$build_secrets_checkout/bugsplat/bugsplat.sh"
     set +x
-    # HACK: Suppress for Mac until BugSplat fixes the Mac client API
-    if [ -r "$bugsplat_sh" -a "$arch" != "Darwin" ]
+    if [ -r "$bugsplat_sh" ]
     then # show that we're doing this, just not the contents
          echo source "$bugsplat_sh"
          source "$bugsplat_sh"
-- 
cgit v1.2.3


From c2178bb6ac139d47eb2bfdf9e85811a6f02810ed Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 24 Aug 2018 09:56:56 -0400
Subject: DRTVWR-447: Introduce explicit CMake BUGSPLAT_DB variable.

Define the CMake cache variable, with empty string as its default.

Make build.sh pass the BUGSPLAT_DB environment variable as a CMake
command-line variable assignment.

Change CMake 'if (DEFINED ENV{BUGSPLAT_DB})' to plain 'if (BUGSPLAT_DB)'.

Make CMake pass new --bugsplat switch to every one of SIX different
invocations of viewer_manifest.py.

Give llmanifest.main() function an argument to allow supplementing the base
set of command-line switches with additional application-specific switches.

In viewer_manifest.py, define new --bugsplat command-line switch and pass to
llmanifest.main(). Instead of consulting os.environ['BUGSPLAT_DB'], consult
self.args['bugsplat'].
---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index d531c0b046..c38bb6fff4 100755
--- a/build.sh
+++ b/build.sh
@@ -122,6 +122,7 @@ pre_build()
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
+     -DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \
      -DVIEWER_CHANNEL:STRING="${viewer_channel}" \
      -DGRID:STRING="\"$viewer_grid\"" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
-- 
cgit v1.2.3


From 3f7c75b8a075a5cd5765b1791a58f5d8e2b164dd Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 27 Aug 2018 13:55:50 -0400
Subject: SL-957: Explicitly pass VIEWER_SYMBOL_FILE from build.sh into CMake
 instead of relying on both indra/newview/CMakeLists.txt and build.sh
 generating the same file pathname.

Make build.sh set VIEWER_SYMBOL_FILE (instead of symbolfile) in pre_build, and
pass it to autobuild configure via -D switch. Then the uploads stanza can just
use VIEWER_SYMBOL_FILE instead of performing its platform-sensitive case
statement right there.

Introduce VIEWER_SYMBOL_FILE CMake cache variable, default empty string.

Make indra/newview/CMakeLists.txt generate_breakpad_symbols logic conditional
on VIEWER_SYMBOL_FILE being non-empty, as well as everything else. Eliminate
local set(VIEWER_SYMBOL_FILE) directives.
---
 build.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index c38bb6fff4..976228cdf1 100755
--- a/build.sh
+++ b/build.sh
@@ -103,6 +103,23 @@ pre_build()
                   "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
     fi
 
+    if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
+    then
+        case "$arch" in
+            CYGWIN)
+                symplat="windows"
+                ;;
+            Darwin)
+                symplat="darwin"
+                ;;
+            Linux)
+                symplat="linux"
+                ;;
+        esac
+        # This name is consumed by indra/newview/CMakeLists.txt
+        VIEWER_SYMBOL_FILE="$build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+    fi
+
     # don't spew credentials into build log
     bugsplat_sh="$build_secrets_checkout/bugsplat/bugsplat.sh"
     set +x
@@ -122,6 +139,7 @@ pre_build()
      -DPACKAGE:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
+     -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" \
      -DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \
      -DVIEWER_CHANNEL:STRING="${viewer_channel}" \
      -DGRID:STRING="\"$viewer_grid\"" \
@@ -245,7 +263,6 @@ initialize_version # provided by buildscripts build.sh; sets version id
 
 # Now run the build
 succeeded=true
-build_processes=
 last_built_variant=
 for variant in $variants
 do
@@ -253,7 +270,6 @@ do
   last_built_variant="$variant"
 
   build_dir=`build_dir_$arch $variant`
-  build_dir_stubs="$build_dir/win_setup/$variant"
 
   begin_section "Initialize $variant Build Directory"
   rm -rf "$build_dir"
@@ -432,19 +448,7 @@ then
                -a -z "${BUGSPLAT_DB:-}" ]
           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" \
+              python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$VIEWER_SYMBOL_FILE" \
                   || fatal "Upload of symbolfile failed"
           fi
 
-- 
cgit v1.2.3


From 5ff160f72e8f4eab7a74491a7b848348267a180a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 30 Aug 2018 12:12:37 -0400
Subject: SL-957: Generate the expected symbols tarball even with BugSplat.

This is a separate step from generating and posting BugSplat symbols, since
BugSplat needs the executable along with the symbols, and we don't need to
consume that space in a symbols tarball.

Move Mac BugSplat symbol generation logic to CMake land, the same general area
where Breakpad symbols are generated. Add stanzas to pack up the usual tarball
for Windows and Mac.

Remove the build.sh test that suppressed uploading the symbols tarball for
BugSplat builds.
---
 build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 976228cdf1..d6a6d7aca8 100755
--- a/build.sh
+++ b/build.sh
@@ -443,9 +443,7 @@ then
       if [ "$last_built_variant" = "Release" ]
       then
           # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
-          # Likewise, BUGSPLAT_DB suppresses generating the symbol file.
-          if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" \
-               -a -z "${BUGSPLAT_DB:-}" ]
+          if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
           then
               # Upload crash reporter file
               python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$VIEWER_SYMBOL_FILE" \
-- 
cgit v1.2.3


From 503c2aa9a30ed484d9f41b415af6ec0f9ca93353 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 31 Aug 2018 15:42:58 -0400
Subject: SL-957: Pass an absolute pathname to CMake for VIEWER_SYMBOL_FILE.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index d6a6d7aca8..de7e474479 100755
--- a/build.sh
+++ b/build.sh
@@ -116,8 +116,10 @@ pre_build()
                 symplat="linux"
                 ;;
         esac
-        # This name is consumed by indra/newview/CMakeLists.txt
-        VIEWER_SYMBOL_FILE="$build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+        # This name is consumed by indra/newview/CMakeLists.txt. Make it
+        # absolute because we've had troubles with relative pathnames.
+        abs_build_dir="$(cd "$build_dir"; pwd)"
+        VIEWER_SYMBOL_FILE="$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2"
     fi
 
     # don't spew credentials into build log
-- 
cgit v1.2.3


From db76dbba33b6c161486099b20b6f820f0e374ef6 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 31 Aug 2018 16:59:59 -0400
Subject: SL-957: Convert absolute VIEWER_SYMBOL_FILE to native_path.

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

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index de7e474479..1f9daa78b2 100755
--- a/build.sh
+++ b/build.sh
@@ -119,7 +119,7 @@ pre_build()
         # This name is consumed by indra/newview/CMakeLists.txt. Make it
         # absolute because we've had troubles with relative pathnames.
         abs_build_dir="$(cd "$build_dir"; pwd)"
-        VIEWER_SYMBOL_FILE="$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2"
+        VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")"
     fi
 
     # don't spew credentials into build log
-- 
cgit v1.2.3