Commit Graph

37116 Commits (ae0b3149badf369eb2b1f10aba830eef8b4af9b4)

Author SHA1 Message Date
Nat Goodspeed ae0b3149ba DRTVWR-418: Fix a round of compile errors surfaced by -std=c++11.
These are mostly things that were in fact erroneous, but accepted by older
compilers.

This changeset has not yet been built with Visual Studio 2013 or Linux gcc,
even with -std=c++11.

This changeset has not been built *without* -std=c++11. It should be used in
conjunction with a corresponding change to LL_BUILD_DARWIN_BASE_SWITCHES in
viewer-build-variables/variables.

This is a work in progress. We do not assert that this changeset completes the
work needed to turn on -std=c++11, even on the Mac.
2017-02-23 16:49:49 -05:00
Nat Goodspeed 80a878a792 DRTVWR-418: Merge from v-r makes llmath tests need Boost.Thread. 2017-02-04 08:54:01 -05:00
Nat Goodspeed 3e4f6d7d50 DRTVWR-418: Finish cleaning up merge from viewer-release. 2017-02-04 08:52:59 -05:00
Nat Goodspeed 37974a2fa2 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-02-03 20:14:32 -05:00
Nat Goodspeed 275d2e7e02 Automated merge with ssh://bitbucket.org/callum_linden/viewer64-xcode8 2017-02-03 16:47:26 -05:00
Nat Goodspeed ead15a8ff5 DRTVWR-418: Remove most (all?) of the "stubs" from llurlentry_test.
At some point the INTEGRATION_TEST_llurlentry build changed so that the
library(ies) we attempted to stub out got linked in anyway, so that instead of
simplifying the test, the stubs broke it with "duplicate symbol" errors.
Commenting out the stubs permits the test program to succeed.
2017-02-03 16:46:46 -05:00
Nat Goodspeed 4436e808b1 DRTVWR-418: Eliminate llui reference to newview's gSavedSettings.
Instead, since gSavedSettings is an LLControlGroup and LLControlGroup derives
from LLInstanceTracker, just look up the LLControlGroup with canonical name.
2017-02-03 12:49:19 -05:00
Nat Goodspeed f0a7914721 DRTVWR-418: INTEGRATION_TEST_llurlentry depends on Hunspell. 2017-02-03 10:43:47 -05:00
Nat Goodspeed c2c4a1e851 DRTVWR-418: Make operator()() method for comparator functor const. 2017-02-03 10:34:01 -05:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Oz Linden 080744d899 increment viewer version to 5.0.2 2017-02-02 15:44:52 -05:00
Oz Linden 154b30cbf3 Added tag 5.0.1-release for changeset c9ce22950129 2017-02-02 15:44:51 -05:00
Callum Linden df4957e398 Automated merge with head of lindenlab/nat_viewer64 2017-01-30 13:56:38 -08:00
Nat Goodspeed 189d56fa3e DRTVWR-418: Commit restoring -quiet switch for Xcode 8. 2017-01-30 15:53:39 -05:00
Nat Goodspeed 25c620d1f0 DRTVWR-418: Backed out changeset f03df2b249d0: restore -quiet.
As of now, this fork requires Xcode 8, which introduces support for the -quiet
switch.
2017-01-30 15:49:49 -05:00
Nat Goodspeed 75f54d5d53 DRTVWR-418: Merge from oz_viewer64 2017-01-30 11:55:28 -05:00
Callum Linden dcae92c0a3 First batch of changes to add LibVLC media plugin to macOS viewer. Plugin fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes 2017-01-27 15:47:16 -08:00
Callum Linden f13c2a6d31 First set of changes to build (tests off) to build correctly against Xcode 8 and SDK 10.12 2017-01-19 14:19:46 -08: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 1fe8d04a46 DRTVWR-418, MAINT-7038: Don't add double quotes to channel name.
The CMake directive that passes VIEWER_CHANNEL to the C++ compiler as
LL_VIEWER_CHANNEL was enclosing the VIEWER_CHANNEL value in double quotes. At
this point in history, those double quotes literally become part of the
LL_VIEWER_CHANNEL value, causing the viewer to construct a bad Viewer Version
Manager query containing those double quotes. Removing them fixes the query.
2017-01-05 18:49:56 -05:00
Nat Goodspeed b0da6275f7 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-01-04 17:06:00 -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 24d2c4ae48 DRTVWR-418: Harmless change to kick TeamCity build. 2017-01-04 12:04:33 -05:00
Nat Goodspeed 8b4022f041 DRTVWR-418: Consume autobuild_configure_parameters in build.sh. 2017-01-04 09:27:36 -05:00
Nat Goodspeed 3b62401cf5 DRTVWR-418: Remove -DENABLE_SIGNING and -DSIGNING_IDENTITY
from autobuild.xml's darwin64 Release and ReleaseOS build (xcodebuild)
command.

-D passed to xcodebuild does NOT set CMake variables. These switches, in this
 place, have never worked as intended.
2017-01-03 15:54:37 -05:00
Nat Goodspeed eff6bbea59 DRTVWR-418: Emit less confusing error message when LL_BUILD not set.
When LL_BUILD is not in the environment at autobuild configure time, important
macros such as LL_WINDOWS aren't set. That means that platform-dependent
macros such as LL_TYPEOF() aren't defined, which can produce obscure errors
like this:

indra\llcommon\llunittype.h(51): error C2226: syntax error :
unexpected type 'S' (packages\llphysicsextensions\stub\LLPhysicsExtensionsStubImpl.cpp)
10>          indra\llcommon\llunittype.h(52) :
see reference to class template instantiation 'LLResultTypeAdd<S,T>' being compiled

Make the CMake logic fail with a more readily-understood error in that case.
2016-12-22 16:12:21 -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 9c0536f099 remove the xcodebuild -quiet because Xcode 7 doesn't do it 2016-12-22 12:59:30 -05:00
Oz Linden b7d798069e merge trunk changes 2016-12-22 12:22:40 -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 be69197e0d merge changes from project trunk 2016-12-22 11:16:55 -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
Oz Linden 04c7a7a64a try using xcodebuild -quiet 2016-12-21 16:40:23 -05:00
Nat Goodspeed 546ead3d61 DRTVWR-418: Update to llphysicsextensions 501678, 501679 2016-12-21 16:02:31 -05:00
Nat Goodspeed a2a5bdf4b5 DRTVWR-418: Use ensure_equals() on iffy lerp test to display values. 2016-12-21 13:17:18 -05:00
Nat Goodspeed 594221790b DRTVWR-418: Fix a couple unused-variable fatal warnings in local builds.
If the only use of a variable is within llassert(), have to make the
declaration conditional on SHOW_ASSERT rather than guesswork about release
builds.
2016-12-21 12:46:28 -05:00
Nat Goodspeed 03d65d4ec4 DRTVWR-418: Deal with fatal warning 'unsafe mix of bool and BOOL' 2016-12-21 11:33:58 -05:00
Nat Goodspeed b3212f873d DRTVWR-418: Harmless change to kick the TeamCity build. 2016-12-21 10:43:42 -05:00
Nat Goodspeed 1cbdfce396 DRTVWR-418: Avoid constructing symlink cycle for CEF framework. 2016-12-20 21:27:40 -05:00
Oz Linden 725ba32d08 don't add llcorehttp to all tests 2016-12-20 17:18:56 -05:00
Nat Goodspeed 7359ec3ed8 DRTVWR-418: Temporarily suppress Havok in darwin64 builds. 2016-12-20 16:46:06 -05:00
Nat Goodspeed e575abe99f DRTVWR-418: Create CEF framework symlink from LLCefLib Helper.app.
Without that symlink, the helper app can't find CEF and we get no web content.
2016-12-20 16:44:51 -05:00
Nat Goodspeed a1a395b679 DRTVWR-418: Make viewer_manifest.py copy current libexpat.1.dylib. 2016-12-20 15:42:57 -05:00
Nat Goodspeed 8643954c70 DRTVWR-418: Update GLOD with build that's really 64-bit on Mac. 2016-12-20 15:11:20 -05:00
Nat Goodspeed be3e3fca32 DRTVWR-418: Fix libhunspell references to reflect current package. 2016-12-20 15:05:02 -05:00