Commit Graph

223 Commits (d2294841b2df66f4e684b5eed1cae955cea21cf8)

Author SHA1 Message Date
Nat Goodspeed 853cf3928c SL-18837: Don't fetch (unmigrated) build-secrets, use GH secrets. 2023-06-28 16:44:03 -04:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Dave Houlton 6b2e40157b Merge branch 'master' v6.4.24 into DRTVWR-546 2021-10-13 16:41:24 -06:00
Nat Goodspeed 3e12a97a7f SL-16040: Honor autobuild_{configure,build}_parameters variables.
The generic build.sh script honors these environment variables to specify
parameters to the autobuild configure and autobuild build steps, respectively.
Support them in the viewer-specific build.sh too.

In the generic build.sh, autobuild_configure_parameters allows specifying
command-line switches either for autobuild or, following --, for the
underlying tool (in our case, CMake). In order to support that variable the
same way here, we insert -- (as before) when autobuild_configure_parameters is
unset or empty, since the rest of the switches *we* specify are for CMake.

That means that, as with the generic build.sh, a non-empty
autobuild_configure_parameters override must precede any switches intended for
CMake with the -- separator.
2021-09-28 16:40:33 -04:00
Brad Payne (Vir Linden) e3c256bdaf SL-15572 - retry logic for codeticket.py commands 2021-09-09 23:07:15 +03:00
Andrey Lihatskiy 97f09de4fc Merge branch 'master' into DRTVWR-520-apple-notarization
# Conflicts:
#	autobuild.xml
#	build.sh
#	indra/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewermacosx.cpp
#	indra/newview/llappviewerwin32.h
#	indra/newview/viewer_manifest.py
#	indra/win_crash_logger/llcrashloggerwindows.cpp
2021-08-12 23:13:12 +03:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
Brad Payne (Vir Linden) 4d15f18d92 SL-15572 - retry logic for codeticket.py commands 2021-07-13 21:40:00 +01:00
Brad Payne (Vir Linden) 502afc5ed2 SL-15572 - shorter sleeps in build.sh 2021-07-13 18:20:56 +01:00
Brad Payne (Vir Linden) 3d57b7946a SL-15572 - more sleeps in build.sh 2021-07-13 16:19:35 +01:00
Brad Payne (Vir Linden) e0eb9b96f7 SL-15572 - Possible fix for codeticket upload issue 2021-07-13 14:55:11 +01:00
Nat Goodspeed 6460b7ac41 SL-15500: Only run coding_policy_git.py on Mac
since it fails on Windows due to some problem in the underlying library.

Also wrap the coding policy checks in a TC log subsection.
2021-06-30 09:48:02 -04:00
Nat Goodspeed d2de2f9d25 SL-15500: Always have to work around Windows path incompatibilities. 2021-06-30 08:11:30 -04:00
Nat Goodspeed 0276a32569 SL-15500: Use plain pip install, not pip_install shell function.
pip_install doesn't know about the '-r requirements.txt' feature.
2021-06-29 18:04:03 -04:00
Nat Goodspeed ab185263fa SL-15500: Install git-hooks (and requirements) and run policy check
on the entire current (branch of the) viewer repo before starting any build.
2021-06-29 17:45:13 -04:00
Nat Goodspeed fd1545197a SL-10297: Merge branch 'sl-10297-oz' into sl-10297.
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few
other miscellaneous goodies.
2021-05-12 13:56:19 -04:00
Andrey Kleshchev 8803157a21 SL-13953 Builds should fail if symbols upload failed 2020-10-05 20:56:26 +03:00
Oz Linden a9d271c5a2 SL-10297 merged 6.4.7 2020-08-24 13:11:07 -04:00
Oz Linden 86009f885e SL-10297: merge up to master at 6.4.3 2020-06-15 15:29:04 -04:00
Anchor b09770946a [DRTVWR-476] - disable dbghelp.h warnings 2020-03-25 18:39:20 -04:00
Anchor 636989c139 [DRTVWR-476] - target windows 10 2020-03-25 18:39:20 -04:00
Nat Goodspeed e849dfb9fa DRTVWR-476: Update Copy3rdPartyLibs.cmake for VS 2017 version.
Also, on Windows, put build output into
build-vc$AUTOBUILD_VSVER-$AUTOBUILD_ADDRSIZE instead of hard-coding
build-vc120-$AUTOBUILD_ADDRSIZE.
2020-03-25 16:08:43 -04:00
Oz Linden 2c81050b68 SL-12615: Support a branch-specific setting for viewer_channel in TeamCity builds 2020-01-28 18:50:37 +02:00
Oz Linden e409c0492f convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approach 2019-03-02 11:58:11 -05:00
Oz Linden fc90cad4f3 change the default crash type from "freeze" to "other" 2019-01-16 16:42:34 -05:00
Oz Linden 6c533888ba build hack for upload failures 2019-01-14 16:30:49 -05: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
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
Nat Goodspeed 3ca8263fb4 Backed out changeset 25b55601514d: re-enable building BugSplat on Mac. 2018-08-15 16:12:56 -04: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
Glenn Glazer 5134805c66 MAINT-7192: upgrade to VMP package 506412 2017-06-12 13:26:19 -07: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
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