diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-28 12:39:42 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-28 12:39:42 -0400 |
| commit | f6e7893a6e34190e8080d289a5f89d7f9c47d583 (patch) | |
| tree | aa509218b6fa486a6f41101703e7796b2ed5e8ad /build.sh | |
| parent | e766d9e697eae29b3f82106603843efbeb7aa01b (diff) | |
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.
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |