Commit Graph

158 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
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 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
Nat Goodspeed ebcfbf277e Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2019-06-05 14:15:15 -04: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 6684e96b98 [DRTVWR-476] - fix msvc version 2019-04-16 19:34:06 -07: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 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 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
callum_linden 6c953d0bde Automated merge with tip of viewer-release after Viewer Media Update release 2018-04-12 15:22:25 -07:00
Oz Linden 4181b1d9e2 correct 64bit vivox dll names 2018-01-18 12:49:54 -05:00
Oz Linden 96d28ad5a7 more places where vivox names must be conditional on address size 2018-01-18 10:15:15 -05:00
Oz Linden d7c8678c3a merge 5.1.0-release 2018-01-17 12:43:28 -05:00
callum_linden dd0d2805e2 Automated erge with tip of viewer64 2017-11-30 14:44:44 -08:00
Nat Goodspeed 762582c499 MAINT-7081: Mention libnghttp2*.dylib in yet another place. 2017-10-24 15:38:00 -04:00
callum_linden 0ee774c39f Missed a place in the Copy3rdPartyLibs.cmake file (thank Windows Find) that needs to differentiate between 32 and 64 bit Windows builds 2017-10-23 11:37:06 -07:00
callum_linden 803b75a718 First version that builds with a dummy BugSplay call in llapp.cpp 2017-10-18 18:36:10 -07:00
Nat Goodspeed ee2a1902a5 MAINT-7081: Mention nghttp2.dll where it must be mentioned. 2017-09-29 08:46:44 -04:00
Nat Goodspeed 19bb6fd33e MAINT-7081: Mention nghttp2 library wherever it must be mentioned. 2017-09-27 15:27:30 -04:00
Glenn Glazer c538ff12c5 SL-700: temporarily use local version of ca-bundle.crt instead of from voice, misc cleanup 2017-06-14 14:16:23 -07:00
Callum Prentice 7005310541 Fix MAINT-7360 Investigate removal of MSVCR100.DLL and MSVCP100.DLL 2017-05-01 12:42:12 -07:00
Callum Prentice cb07ca3510 Fix for MAINT-7131 Unable to start the x64 Viewer on Windows 8.1 x64. This appears to be because two of the MS DLLs we ship with the 64 bit viewer are 32bit. Manually replacing them with their 64 bit equivalents allowed the viewer to start on Windows 8.1. The change forces the cmake file which copies the DLLs to look in C:\windows\SysWOW64 for 32 bit versions and C:\windows\system32 for 64 bit versions. (yes really). 2017-03-27 17:11:00 -07:00
Nat Goodspeed 771c7dd3c0 DRTVWR-418: Update some copy commands for 3p library versions. 2016-12-10 12:12:51 -05:00
Callum Prentice 004cd151ff update copying of fmodex{64}.dll to right place for 32/64 bit builds 2016-12-05 12:24:00 -08:00
Nat Goodspeed 6979fc5667 DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll. 2016-11-28 15:45:58 -05:00
Oz Linden 4bf583aaa2 SL-429: Use a new certificate authority bundle based on data from Mozilla 2016-07-21 17:14:07 -04:00
callum_linden 9c4ed8d113 Automated merge with tip of viewer-release to pick up 4.0.5 2016-05-19 11:00:03 -07:00
callum_linden b50df60aa1 DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewer 2016-04-21 16:13:39 -07:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden fa1913ea67 merge changes for STORM-2109 2015-06-16 14:42:31 -04:00
AndreyL ProductEngine c76e983b03 MAINT-2577 Fixed the status message 2015-06-12 11:37:17 +03:00
AndreyL ProductEngine fd45c728b2 MAINT-5277 FIXED Viewer is missing MSVCP100.DLL and MSVCR100.DLL 2015-06-12 11:11:38 +03:00
Bjoseph Wombat 239bff7182 Changes to remove zlib and vivoxplatform dlls from the windows build 2015-05-19 20:18:24 -04:00
Nat Goodspeed 198046e21d Include MSVCP120.DLL and MSVCR120.DLL in Windows viewer package.
Generalize Copy3rdPartyLibs.cmake to eliminate some clone-and-tweak redundancy.
2015-01-27 15:34:43 -05:00
Nat Goodspeed 93fe221208 Backed out changeset 1e36e0629994 copying .dylibs on Linux
The .dylib files in the Linux Vivox package were erroneous to start with;
while the affected changeset bypassed copy errors, it too was wrong. Now that
the Linux Vivox package contains Linux .so files, revert to the correct
filenames to copy.
2015-01-21 08:28:33 -05:00
Oz Linden 707e51629e update libs to match vivox distribution 2014-12-22 16:43:28 -05:00
Monty Brandenberg 29bea5a6b9 Merge. Refresh from viewer-release after 3.7.11 release. 2014-07-08 17:29:48 -04:00
Monty Brandenberg 5b542e227b All: Committing to llqtwebkit2 and the future. Updating all libraries.
Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556.  Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake.  It
is the README for the building process based on things learned during
this library project.  Switch building process back to style used for
new llqtwebkit2 repo.  This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building.  All have comparable FPS rates.  Builds are
getting quieter.  Forward, comrades!
2014-06-03 19:37:58 -04:00
Monty Brandenberg 403ec62e3c All: Update library SDL to 290309, c-ares to 290089, boost to 290191,
colladadom to 290229, curl to 290186, fontconfig to 290258, freetype to 290255,
google-mock/gmock/gtest to 290199, libpng to 290081, libxml2 to 290157,
llqtwebkit to 290262/250147 (to be fixed shortly), openssl to 290083,
pcre to 290150, zlib to 290080.  The freetype2 headers are now normalized
to what they would normally be on a unix-type system.  Libxml2 and
pcre are available on all platforms.  Libraries generally move in the
direction of static archives rather than shared libraries (e.g. openssl).
The llqtwebkit side is a step back from the more ambitious goal.  What
will be used (290262) will be a simple rebuild of the existing 4.7.1
library with updated package dependencies.  The bigger work will be in
the future.
2014-05-28 19:40:45 +00:00
Oz Linden d00d37d23b merge changes for OPEN-199 2014-04-22 16:03:35 -04:00
Monty Brandenberg 04404b68b5 All/Mac: Update libraries to new template builds. Package for static libz/libpng/openssl.
Update library dependencies to reference builds using new templates and
modern build hosts for:  SDL, c-ares, boost, curl, libpng, llqtwebkit2,
openssl and zlib.  Update manifest, library copying and 'test_apps' setup
to reflect that zlib and openssl are now always static (on Mac and
Linux).  Viewer and test_apps now functional on 10.7 Mac.
2014-04-14 17:59:00 -04:00
Monty Brandenberg e72d546fe3 Mac: Update llqtwebkit build, build and package dylib Qt4 pieces.
Part of the switchover to dynamic Qt4.  This mostly completes the
Mac side.  Webkit is functional on Mac, plugins work.  The two
test programs, llfbconnectest and llplugintest, need a little
more work to run without manual fixup ('.' on PATH and maybe a
symlink to libz.1.dylib and they run and function on Mac).  Also
need to address libz.dylib vs libz.a.  Currently resolving against
dylib which is not what I want.
2014-04-11 19:19:22 -04:00