Commit Graph

217 Commits (9edad026f4494de1a6f02ecc3f477faa27a361ef)

Author SHA1 Message Date
Ansariel 606adaffe7 Merge viewer-bugsplat 2018-09-12 18:09:43 +02:00
Nat Goodspeed db76dbba33 SL-957: Convert absolute VIEWER_SYMBOL_FILE to native_path.
Thanks Ansariel.
2018-08-31 16:59:59 -04:00
Nat Goodspeed 503c2aa9a3 SL-957: Pass an absolute pathname to CMake for VIEWER_SYMBOL_FILE. 2018-08-31 15:42:58 -04:00
Ansariel 6bd724e65a Merge viewer-bugsplat 2018-08-31 09:17:34 +02:00
Nat Goodspeed 5ff160f72e 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.
2018-08-30 12:12:37 -04:00
Nat Goodspeed 3f7c75b8a0 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.
2018-08-27 13:55:50 -04:00
Nat Goodspeed c2178bb6ac 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'].
2018-08-24 09:56:56 -04:00
Ansariel 23473b4585 Merge viewer-bugsplat 2018-08-22 14:22:22 +02:00
Nat Goodspeed 3ca8263fb4 Backed out changeset 25b55601514d: re-enable building BugSplat on Mac. 2018-08-15 16:12:56 -04:00
Ansariel 0f121d042d Merge viewer-bugsplat 2018-07-27 11:19:42 +02:00
Nat Goodspeed f1eb3c1b63 DRTVWR-447: Temporarily suppress building for BugSplat on Mac. 2018-07-18 20:32:35 -04:00
Nat Goodspeed f6e7893a6e 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.
2018-06-28 12:39:42 -04:00
Nat Goodspeed 786f80b942 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.
2018-06-14 19:03:17 -04:00
Oz Linden d2fa5a53e8 remove unused UNATTENDED cmake variable that generates warnings 2018-05-30 13:14:43 -04:00
Oz Linden 837ca22924 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")
2018-05-30 10:36:23 -04:00
Oz Linden 0fedc97f3f always run tests 2018-05-30 10:32:47 -04:00
Nat Goodspeed 8781b36d7e 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.
2018-05-25 16:08:00 -04:00
Nat Goodspeed 63fe7d802a 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.
2018-05-25 12:09:50 -04:00
Ansariel e6f9a5e2db Merge viewer64 2017-07-27 21:07:14 +02:00
Glenn Glazer 5134805c66 MAINT-7192: upgrade to VMP package 506412 2017-06-12 13:26:19 -07:00
Nicky 985730a52c Merge. 2017-05-18 17:40:24 +02:00
nat_linden 0b4f516230 Merged in coyot/viewer64-build-results-dotted (pull request #11)
Approved-by: Scott Lawrence (Oz Linden) <oz@lindenlab.com>
2017-05-11 10:44:56 +00:00
Glenn Glazer 12893fd5ab redirect file contents to stdout before passing to mimetype 2017-03-30 09:47:49 -07:00
Glenn Glazer c35fde6aaf change mimetype to inline-text per review comment from Nat 2017-03-30 08:38:45 -07:00
Glenn Glazer d07751e8de add version string to ct2 results 2017-03-29 16:42:22 -07:00
Nat Goodspeed 038c555fc4 DRTVWR-418: In viewer64-mac-havok fork, turn on Xcode 8 Havok.
This is known not to work yet: the relevant Havok libraries are not being
bundled with llphysicsextensions, therefore the viewer can't link with any
Havok symbols.
2017-02-21 17:12:27 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nat Goodspeed f40bd0fac3 DRTVWR-418, SL-619: Update to google_breakpad build 501824
and re-enable breakpad symbol generation.
2017-01-06 17:03:35 -05:00
Nat Goodspeed 85438e6725 DRTVWR-418: Fix line-break problem; also explicitly request bash. 2017-01-04 15:27:31 -05:00
Nat Goodspeed 0529000452 DRTVWR-418: Set signing CMake switches in build.sh for proper quoting. 2017-01-04 14:15:54 -05:00
Nat Goodspeed 8b4022f041 DRTVWR-418: Consume autobuild_configure_parameters in build.sh. 2017-01-04 09:27:36 -05:00
Nat Goodspeed 5bb619da97 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2016-12-22 15:12:31 -05:00
Nat Goodspeed eaeadf71e0 DRTVWR-418: If we don't produce a symbol file, don't try to upload it. 2016-12-22 15:11:37 -05:00
Oz Linden 0131e8a081 one more try... also fixing setting of viewer_channel without quotes 2016-12-22 13:54:39 -05:00
Oz Linden 6ef555414d try again to actually fix the installer name function for Mac (and maybe Linux?) 2016-12-22 11:50:33 -05:00
Oz Linden e9f5ed6591 fix installer name function for Mac (and maybe Linux?) 2016-12-22 10:18:48 -05:00
Nat Goodspeed aa2aa5e2da 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.
2016-12-21 20:51:18 -05:00
Nat Goodspeed 7a83f26323 DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py. 2016-12-21 19:11:58 -05:00
nat_linden bf0a0807de Merged in lindenlab/nat_viewer64 (pull request #6)
DRTVWR-418: Change Mac build_directory to build-darwin-x86_64 since we no longer support 32-bit Mac builds.
2016-12-09 13:05:58 -05:00
Oz Linden 09b88cf4af add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output tag to just "Symbolfile" 2016-12-09 08:12:15 -05:00
Nat Goodspeed e6513c1eee 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-*.
2016-12-08 12:31:30 -05:00
Oz Linden 6976377aa1 use native paths for llphysicsextensions_package file name 2016-12-08 10:11:58 -05:00
Oz Linden c2f7079698 make all upload failures fatal 2016-12-08 09:57:31 -05:00
Oz Linden 7a5fbe8d1a correct upload of default installer 2016-12-08 09:35:54 -05:00
Oz Linden 7b3ff5418e make build.sh use the same build directory that autobuild.xml uses on Windows 2016-12-07 19:58:01 -05:00
Oz Linden 54f1f81d5a comment out building the tpv distro for llphysicsextensions to unblock others 2016-12-07 18:22:34 -05:00
Oz Linden c89c1e5f61 correct paths for building llphysicsextensions_tpv package 2016-12-07 14:09:20 -05:00
Oz Linden 83209ef5c0 remove more bits of the old build system 2016-12-05 13:28:40 -05:00
Oz Linden fad899fe6c correct merge duplications, put source_environment commands into sections 2016-12-05 10:14:18 -05:00
Oz Linden 16266bedd1 merge sling-buildscripts updates 2016-12-05 10:04:15 -05:00