Commit Graph

36429 Commits (a2067761bbb406e40842ad8ea5275ac4a7dfd44d)

Author SHA1 Message Date
Nat Goodspeed a2067761bb DRTVWR-418: Revert unintentional expansion of $vars in autobuild.xml. 2016-11-29 17:31:47 -05:00
Nat Goodspeed c5e6a960fb DRTVWR-418: Update to openjpeg build 501102 2016-11-29 16:43:57 -05:00
Nat Goodspeed 809c0575bc DRTVWR-418: Add viewer-build-variables to BuildParams 2016-11-29 16:22:06 -05:00
Nat Goodspeed 4d859d58bb DRTVWR-418: Rename darwin platform to darwin64.
We never intend to support 32-bit Mac builds any more.

This change eliminates the autobuild warning about not finding darwin64 and
therefore falling back on plain darwin.
2016-11-29 16:19:46 -05:00
Nat Goodspeed 6979fc5667 DRTVWR-418: Revert one more openjp2.dll reference to openjpeg.dll. 2016-11-28 15:45:58 -05:00
Nat Goodspeed f9e0af1441 DRTVWR-418: Update to SDL build 501092. 2016-11-23 12:50:05 -05:00
Nat Goodspeed aadeec30ed Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2016-11-23 12:09:40 -05:00
Nat Goodspeed fc4564c415 DRTVWR-418: Work around missing LLCEFLibSettings::page_zoom_factor. 2016-11-23 12:08:53 -05:00
Nat Goodspeed b9cc216b9c DRTVWR-418: Have to #include "llkdumem.h" even when not LL_DARWIN. 2016-11-23 12:07:31 -05:00
Nat Goodspeed 64a0fac783 DRTVWR-418: Don't report anything in new build-vc120-{32,64}. 2016-11-23 12:06:31 -05:00
Nat Goodspeed 3cffbd0330 DRTVWR-418: Update to llphysicsextensions_stub build 501069 2016-11-23 09:35:18 -05:00
Nat Goodspeed 1adf8756f3 DRTVWR-418: Use build-vc120-32 vs. build-vc120-64 on Windows. 2016-11-22 11:02:14 -05:00
Nat Goodspeed 548f59042f DRTVWR-418: libc++ has stat data in <sys/types.h>. 2016-11-22 08:40:41 -05:00
Nat Goodspeed e7324c8956 DRTVWR-418: Use correct spelling for glh_linear package. 2016-11-22 08:39:31 -05:00
Nat Goodspeed 9c55b36856 DRTVWR-418: Update comments to reflect status of P0091R3.
Some day llmake() will be unnecessary because compiler deduction of class
template arguments from constructor arguments has been approved by ISO.
2016-11-22 08:37:45 -05:00
Nat Goodspeed 40f7501319 DRTVWR-418: Use uintptr_t when casting pointers to ints.
LLPrivateMemoryPool and LLPrivateMemoryPoolManager have assumed that it's
always valid to cast a pointer to U32. With 64-bit pointers, no longer true.
2016-11-22 08:35:41 -05:00
Nat Goodspeed 2c8ad717fd DRTVWR-418: Update viewer to openssl 501051, curl 501064 2016-11-22 08:32:56 -05:00
Nat Goodspeed 8b61d4f277 DRTVWR-418: Change to libc++ on Mac, remove reminder warning. 2016-11-19 08:51:29 -05:00
Nat Goodspeed 92d7eaaf07 DRTVWR-418: Provide Darwin_i686_Manifest alias to Darwin_i386_Manifest.
It's never been clear to me why Macs tend to refer to 32-bit Intel processors
as i386 when other platforms tend to refer to them as i686. New CMake logic to
derive ARCH from ADDRESS_SIZE produces i686. Give viewer_manifest.py a
Darwin_i686_Manifest class alias so it continues to work when arch is passed
as i686 as well as i386.
2016-11-17 17:50:55 -05:00
Nat Goodspeed 73a7b14013 DRTVWR-418: Fold redundant testrunner.py modules together again.
llcorehttp/tests had a clone of llmessage/tests/testrunner.py that was almost
identical save for recognizing an extra optional parameter. Migrate those few
lines into llmessage/tests/testrunner.py; eliminate the copy in llcorehttp;
help test_llcorehttp_peer.py find the testrunner.py in llmessage/tests.
2016-11-17 17:46:50 -05:00
Nat Goodspeed b1185eca82 DRTVWR-418: Fix Windows line endings in include_kdu_xxxx.h 2016-11-17 08:59:01 -05:00
Nat Goodspeed c5770cd1af DRTVWR-418: Add warning about changing to libc++ on Mac. 2016-11-17 08:57:11 -05:00
Nat Goodspeed bc7d8d3a94 DRTVWR-418: Try to make the OSX architecture match computed ARCH
which in turn depends on ADDRESS_SIZE.
2016-11-16 16:06:32 -05:00
Nat Goodspeed 0c43e4e856 DRTVWR-418: Disable unconditional signing for Mac builds.
There Must Be A Better Way.
2016-11-16 16:05:16 -05:00
Nat Goodspeed 5eda71f98d DRTVWR-418: Remove obsolete quotes from autobuild.xml.
With the new autobuild command infrastructure, the quotes that used to be
necessary for correct command-line parsing are now actually undesirable: they
are passed literally to the command in question, causing (e.g.) cmake to
complain that although it knows of a generator called Xcode, there's no
generator called 'Xcode'.
2016-11-16 15:47:21 -05:00
Nat Goodspeed f5e9839627 DRTVWR-418: Replace preprocessor tests for Windows-specific _M_AMD64
with tests on ADDRESS_SIZE, which is now set on the compiler command line.
2016-11-16 15:39:00 -05:00
Nat Goodspeed d833e45c28 DRTVWR-418: Pass ADDRESS_SIZE down into C++ compilation
by adding -DADDRESS_SIZE= to the compile switches.

Remove hack to work around limitations of gcc 4.1 build hosts.

Streamline a bit of logic to specify correct -m32 or -m64 switch.

Use ADDRESS_SIZE instead of ARCH to control -march=pentiumpro.
2016-11-16 15:32:01 -05:00
Nat Goodspeed 8c061ab184 DRTVWR-418: Compute ADDRESS_SIZE from arch if not specified.
Migrate the logic formerly used only for LINUX to detect whether ADDRESS_SIZE
is set to 32 or 64, and if not, detect a default for the platform. But instead
of using uname -m, use python's platform.machine().

On Windows, stop forcing ARCH to i686 and ADDRESS_SIZE to 32.

On Mac, reset default to x86_64 instead of i386; stop forcing ADDRESS_SIZE to
32.
2016-11-16 15:27:36 -05:00
Nat Goodspeed 934b94e74a DRTVWR-418: pull in new viewer-release via viewer64 2016-11-16 10:56:05 -05:00
Nat Goodspeed af349febb3 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-11-16 09:17:44 -05:00
Oz Linden ecd93e5678 increment viewer version to 4.1.3 2016-11-15 16:02:48 -05:00
Oz Linden 0a8e04c717 Added tag 4.1.2-release for changeset bfbba2244320 2016-11-15 16:02:48 -05:00
Nat Goodspeed 0c8556921d DRTVWR-418: Mistakenly inverted the sense of the LL_64BIT_BUILD test. 2016-11-15 16:02:39 -05:00
Nat Goodspeed 6c7a972861 DRTVWR-418: Fold windows64 into windows platform with new autobuild.
autobuild 1.1 now supports expanding $variables within a config file --
support that was explicitly added to address this very problem. So now the
windows platform in autobuild.xml uses $AUTOBUILD_ADDRSIZE,
$AUTOBUILD_WIN_VSPLATFORM and $AUTOBUILD_WIN_CMAKE_GEN, which should handle
most of the deltas between the windows platform and windows64.

This permits removing the windows64 platform definition from autobuild.xml.

The one remaining delta between the windows64 and windows platform definitions
was -DLL_64BIT_BUILD=TRUE. But we can handle that instead by checking
ADDRESS_SIZE. Change all existing references to WORD_SIZE to ADDRESS_SIZE
instead, and set ADDRESS_SIZE to $AUTOBUILD_ADDRSIZE. Change the one existing
LL_64BIT_BUILD reference to test (ADDRESS_SIZE EQUAL 64) instead.
2016-11-15 15:53:24 -05:00
Nat Goodspeed 222d5621fd DRTVWR-418: Use separate XML string elements for command arguments.
autobuild now passes a vector of arguments to the commands it executes,
instead of smashing everything together into a single string only to have
cmd.exe parse it back into individual arguments again. In general, this is a
good thing and more robust than before.

However, it surfaces the fact that sometimes people were lazy and encoded
things like "-configuration Release" or "-j 12" as single <string> elements in
the XML. When such things are handed to the command as a single argument string
containing a space, it can get confused.

Code (e.g.) <string>-configuration</string><string>Release</string> instead.
2016-11-08 22:22:39 -08:00
AndreyL ProductEngine 7b356a0011 Backed out changeset: fb2eb1a59be6
Reverting MAINT-6125
2016-11-08 03:26:25 +02:00
AndreyL ProductEngine c24b95e483 Backed out changeset: 2a56972b1571
Reverting MAINT-6259
2016-11-08 04:45:47 +02:00
AndreyL ProductEngine 0e6e04317b Backed out changeset: 27782e83386b
Reverting MAINT-6793
2016-11-08 04:44:46 +02:00
AndreyL ProductEngine 1ff67ec512 MAINT-6914 Increase maximum UI size value to 4.0 2016-11-08 01:28:17 +02:00
Nat Goodspeed bdd9777505 DRTVWR-418: Update to KDU build 500948. 2016-11-04 09:50:23 -04:00
Nat Goodspeed 0413e40d82 DRTVWR-418: Update KDU and llimagej2ckdu* with certain clang fixes. 2016-11-03 20:48:41 -04:00
Nat Goodspeed 6cc4a8dcd2 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-11-03 09:31:15 -04:00
pavelkproductengine 07e78807a8 MAINT-6810 win10, 4k monitor and UI scale of 2.0 makes most web content too small to read 2016-10-27 19:48:59 +03:00
AndreyL ProductEngine 3b1e19d23e Backed out changeset: 5816c800a9c1
Prervious MAINT-2141 fix causes MAINT-6791 so reverted it
2016-10-26 02:31:16 +03:00
andreykproductengine 6b1f96187d MAINT-6793 Rigged mesh sometimes full of holes 2016-10-18 15:32:01 +03:00
andreykproductengine 9564600206 MAINT-6487 Decreasing delay 2016-10-18 19:57:19 +03:00
Rider Linden 877c01f3f2 Merged lindenlab/viewer-bear into default 2016-10-17 15:57:03 -07:00
Rider Linden 826afcaf38 Merge 2016-10-17 15:48:14 -07:00
Rider Linden 391ae4dee4 MAINT-6837: forced sit error messages. 2016-10-17 15:44:40 -07:00
andreykproductengine 881fe0a117 Restored MAINT-4488 (perviosly reverted in MAINT-6242) 2016-10-18 01:29:27 +03:00