Commit Graph

37190 Commits (8cbaaa364f6bfd01aeb4280689e2f883a5ffed53)

Author SHA1 Message Date
Glenn Glazer 8cbaaa364f SL-321: add new VMP package, fix llbase path 2017-03-10 09:23:35 -08:00
Glenn Glazer 2e01122575 SL-321: add local llbase support for Windows 2017-03-09 10:28:16 -08:00
Glenn Glazer c69db33ded SL-321: fix windows pathing, add icons 2017-03-08 12:34:11 -08:00
Glenn Glazer cf8dc0d97a SL-321: reintegration of autobuild as package, build changes for linux and windows integration 2017-03-07 15:05:42 -08:00
Glenn Glazer b69831b691 SL-321: add new ViewerManager.cmake file, knowingly overriding commit hooks 2017-03-06 15:36:50 -08:00
Glenn Glazer 9c5332b301 SL-321: reintegration of autobuild as package, build changes for mac integration 2017-03-06 14:43:57 -08:00
Glenn Glazer 49552a874c SL-321: remove redundant const declaration of MD5HEX_STR_SIZE in llversioninfo, remove extraneous python variable assignment in CMakeLists, run tests with INFO 2017-03-01 23:28:11 -08:00
Glenn Glazer 9ec3b1bb03 SL-321: fix merge removal of llhasheduniqueid from from llloginstance_test's include path 2017-03-01 13:19:34 -08:00
Glenn Glazer a50a2e170d SL-321: fix merge removal of mIsFirstRun definition, remove pyinstaller from viewer cmake, now in VMP package cmake 2017-03-01 11:01:40 -08:00
coyot@coyot-sager-PC 3a3da6e4a7 merge 2017-02-28 22:56:30 +00:00
coyot@coyot-sager-PC 069c938eb6 pull from rev d22beb597e52ecbf1c98f25d4489ea0425eda4b0 of sl-321 2017-02-28 22:35:01 +00:00
Oz Linden f0b256b1cb correct merge error in BuildVersion.cmake 2017-02-22 17:34:46 -05:00
Oz Linden f77af9df43 use AUTOBUILD_BUILD_ID value for revision if available (requires autobuild 1.1.4) 2017-02-22 17:03:00 -05:00
Nat Goodspeed d18060e41c DRTVWR-418: At Oz's request, turn off HAVOK for Mac builds.
This is already done for TeamCity builds in build.sh, but since we don't yet
have 64-bit Xcode 8 Mac Havok working in the viewer, make plain developer
autobuild builds work also.
2017-02-21 12:15:47 -05:00
Oz Linden 9472098e81 improve dependency declarations for packages-info and other settings files 2017-02-15 15:27:05 -05:00
Oz Linden b6cdeb2271 MAINT-7130: suppress stdout from run_build_tests by
converting to logging so that stdout from its command can be captured
cleanly
Make the default be to not print anything
2017-02-15 13:00:20 -05:00
Oz Linden 83f2f43e36 convert run_build_tests to use argparse rather than optparse 2017-02-15 12:14:30 -05:00
Nat Goodspeed a0c1842595 DRTVWR-418: Fix syntax for previous test skip. 2017-02-13 16:53:18 -05:00
Nat Goodspeed a971909a34 DRTVWR-418: Reluctantly skip llcorehttp 503-with-retry test on W64. 2017-02-13 16:07:38 -05:00
Nat Goodspeed 7c08ecff70 Automated merge with ssh://bitbucket.org/lindenlab/nat_viewer64 2017-02-13 16:02:55 -05:00
Nat Goodspeed 8d884c3436 DRTVWR-418: Update to KDU 7.9.502436 2017-02-06 12:26:42 -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