Commit Graph

1083 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Nat Goodspeed 3e4680098d Automated merge with file:///Users/nat/linden/viewer-llsingleton 2019-12-05 09:20:08 -05:00
Nat Goodspeed 4cb6e9ee08 DRTVWR-494: Show copy-paste-friendly env vars and test command.
Moderately often I want to copy the (long) integration test program path from
build output and rerun the test program by hand. But typically we need
environment variables set as well so it can find its dynamic libraries. This
has resulted in my copying parts of several lines of build output, then
pasting to a command prompt, then hand-tweaking the pasted text so it makes
sense as a command.

Streamline run_build_test.py output so less hand-tweaking is needed.
2019-11-23 22:16:39 -05:00
Nat Goodspeed a935194750 DRTVWR-476, SL-12205: Refactor MSVC redist library copying.
Specify all of msvcp$VER.dll, msvcr$VER.dll and vcruntime$VER.dll -- but check
each of them individually, because any given VS release has only a subset of
those. Add messaging to clarify what we're doing.

Introduce to_staging_dirs CMake macro to cut down on redundant boilerplate:
the idiom in which we use copy_if_different twice, once to the Release staging
directory and once to the RelWithDebInfo staging directory, each time
appending the target pathnames to third_party_targets. Replace that idiom with
calls to to_staging_dirs.
2019-11-01 10:33:05 -04:00
Nat Goodspeed 1493210a40 DRTVWR-476, SL-12205: Search for msvcp140.dll, not msvcr140.dll
Evidently, with VS 2017, what would have been msvcr140.dll has become
vcruntime140.dll instead. msvcr140.dll is no longer a good sample DLL for
which to search.
2019-10-31 14:46:11 -04:00
Nat Goodspeed 4ab5e79cf4 DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs. 2019-10-31 13:54:51 -04:00
Nat Goodspeed 8eae1fa7c9 DRTVWR-476: For VS 2017, MSVC_VERSION can be any of a range.
Thanks NickyD.
2019-10-31 09:22:07 -04:00
Nat Goodspeed 5edaa9e6b1 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2019-10-30 13:30:25 -04:00
Nat Goodspeed a47653478d DRTVWR-476: We've observed a couple different values for VS 2017. 2019-10-17 13:28:33 -04:00
Oz Linden 80236bb657 merge 6.3.2-release 2019-10-16 09:07:50 -04:00
Nat Goodspeed 279594dcc1 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2019-10-15 13:56:39 -04:00
Nat Goodspeed b0f9d5c839 Automated merge with ssh://bitbucket.org/lindenlab/viewer-xcode11 2019-09-28 12:41:22 -04:00
Nat Goodspeed c0b13466f1 DRTVWR-476: Add Stack Overflow link for Brad's Xcode 11 signing fix. 2019-09-25 16:46:49 -04:00
Nat Goodspeed 8070100626 Automated merge with ssh://bitbucket.org/lindenlabinternal/viewer-xcode11 2019-09-25 16:29:48 -04:00
Brad Kittenbrink 5d671ff210 Disabled broken automatic code signing for local development when using Xcode 11 2019-09-25 12:53:38 -07:00
Nat Goodspeed 24c7d14199 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2019-09-10 11:54:43 -04:00
Oz Linden b74f698caa handle slvoice executable separately from the vivox libraries, and update mac slvoice package 2019-09-06 11:51:36 -04:00
Oz Linden 4cbef35f50 update Vivox for VOICE-56 2019-07-16 18:17:23 -04:00
Nat Goodspeed a94e289499 DRTVWR-476: On Mac, copy libhunspell-1.3.0.dylib for test programs. 2019-06-26 15:04:16 -04:00
AndreyL ProductEngine 0574d03bfa OPEN-345 Fixed enigmatic messages during build 2019-06-17 19:46:20 +03:00
Nat Goodspeed ebcfbf277e Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2019-06-05 14:15:15 -04:00
Anchor a138374cb3 Merge 2019-05-18 21:43:35 -07:00
Anchor 9c9601ce8a [DRTVWR-476] - fix linking 2019-05-08 18:57:33 -06:00
Anchor 616075f084 [DRTVWR-476] - test adding at beginiing of list 2019-05-08 18:05:49 -06:00
Anchor 6eb4e88d94 [DRTVWR-476] - legacy_stdio_definitions shld be the last library linked 2019-05-08 17:37:05 -06:00
Anchor 0f51b0f267 [DRTVWR-476] - add legacy_stdio_definitions 2019-05-07 23:58:04 -06:00
Anchor 6a250e9bc7 [DRTVWR-476] - update openjpeg 2019-04-18 13:24:14 -07:00
Anchor b9067d9c6b [DRTVWR-476] - fix openjpeg dll path 2019-04-18 11:33:23 -07:00
Anchor 4a095782b6 Merge from viewer-fiber 2019-04-18 10:57:14 -07:00
Anchor 6684e96b98 [DRTVWR-476] - fix msvc version 2019-04-16 19:34:06 -07:00
andreykproductengine 181e66fc12 Get rid of vstool 2019-03-06 16:31:11 +02:00
andreykproductengine 478e4f39d8 Fix for local studio builds 2019-03-04 14:59:33 +02:00
Brad Kittenbrink 24300938a6 Fix failure when building packages-info.txt when autobuild can't be found in xcode's PATH 2019-01-30 17:16:06 -08:00
Nat Goodspeed d2c581c344 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2018-12-28 14:46:49 -05:00
Nat Goodspeed 601cbe1f60 SL-10153: Add ole32 to WINDOWS_LIBRARIES so it's everywhere we need. 2018-12-08 12:18:46 -05:00
Nat Goodspeed 0cb4facf96 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.
2018-10-22 14:58:23 -04:00
Nat Goodspeed 036c52fcdf Automated merge with ssh://bitbucket.org/nat_linden/viewer-poseidon 2018-10-17 10:31:59 -04:00
Nat Goodspeed 8761e87ac5 DRTVWR-474: Remove Python autobuild packages and references to them.
We expect the viewer-manager package to be self-contained: we expect it to
bring with it any Python packages it requires. We no longer force developers
to wrap third-party Python packages as autobuild packages.
2018-09-24 14:02:23 -04:00
Oz Linden 9fd463bd94 remove only-partially-successful attempt to put teamcity blocks around targets 2018-09-07 09:13:57 -04:00
Oz Linden fac16e53f6 refine TeamCity blocks to avoid double nesting, and disable
for Windows
2018-09-07 08:30:21 -04:00
Oz Linden 49c483eeb3 add more block structure to TeamCity log output for components 2018-09-05 18:07:35 -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
andreykproductengine 50f0843e76 Get rid of vstool 2019-03-06 16:31:11 +02:00
andreykproductengine ba24af923c Fix for local studio builds 2019-03-04 14:59:33 +02:00
AndreyL ProductEngine 27e197459d Merge 2019-03-01 02:28:15 +02:00
Nat Goodspeed 1a1465dab9 Re-enable warnings-as-errors (-Werror) in Mac builds. 2019-01-16 14:23:45 -05:00
Oz Linden d2fa5a53e8 remove unused UNATTENDED cmake variable that generates warnings 2018-05-30 13:14:43 -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
Nat Goodspeed c5f618d096 SL-821: Move Windows BugSplat engagement from llcommon to newview.
Use WSTRINGIZE(), LL_TO_WSTRING(), wstringize() to produce required wide
strings. Use a lambda for callback that sends log file; use LLDir, if set, to
find the log file.

Introduce BUGSPLAT CMake variable to allow suppressing BugSplat.
Make BUGSPLAT CMake variable set LL_BUGSPLAT for C++ compilations.

Set viewer version macros on llappviewerwin32.cpp, llappviewerlinux.cpp and
llappdelegate-objc.mm -- because BugSplat needs the viewer version data, and
because the macOS BugSplat hook is engaged in an Objective-C++ function we
override in the app delegate.
2018-05-17 06:53:42 -04:00