From 553f9843b099ec2431d4348f3efc111b819b2a4b Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 19 Dec 2016 23:00:34 -0500 Subject: DRTVWR-418: Update to darwin64 llceflib with libc++, not libstdc++. --- autobuild.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 42930e38e0..3fee68198e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2092,9 +2092,9 @@ archive hash - 9fb85eff4118913543acde89bcb9a9c1 + 3af1210d90aeb9f4d5deea6020ee0d55 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1512/3413/llceflib-1.6.0.501501-darwin64-501501.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1611/3591/llceflib-1.6.0.501600-darwin64-501600.tar.bz2 name darwin64 @@ -2127,7 +2127,7 @@ version - 1.6.0.501501 + 1.6.0.501600 llphysicsextensions_source -- cgit v1.2.3 From 8643954c70e19d9c9cec4a1e8874247e861150a1 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 20 Dec 2016 15:11:20 -0500 Subject: DRTVWR-418: Update GLOD with build that's really 64-bit on Mac. --- autobuild.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 3fee68198e..41112095e7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -968,9 +968,9 @@ archive hash - 047ce52d5fe3e9ac70763de0098cf530 + 017ef34ddf14293099a90c6eaa3615ca url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/719/1462/glod-1.0pre3.500710-darwin64-500710.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1626/3627/glod-1.0pre3.501614-darwin64-501614.tar.bz2 name darwin64 @@ -994,9 +994,9 @@ archive hash - 8cb665230ec24048aa3b733f2b1c3b00 + 9aef5cd576ace19568da01d9bc3db29c url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_3p-glod/rev/314201/arch/Linux/installer/glod-1.0pre4.314201-linux64-314201.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1625/3628/glod-1.0pre3.501614-linux64-501614.tar.bz2 name linux64 @@ -1006,11 +1006,11 @@ archive hash - 511d066e35bbc14dd512c831b53a2fad + 573e68f46f825a1c040daa4994ee2a61 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/720/1465/glod-1.0pre3.500710-windows-500710.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1627/3633/glod-1.0pre3.501614-windows-501614.tar.bz2 name windows @@ -1020,16 +1020,16 @@ archive hash - 7fa6f187fc5e4175a13d3e0d4b6658a4 + f8362e1a2f4d03d99c6231101d3d472e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/721/1468/glod-1.0pre3.500710-windows64-500710.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1628/3638/glod-1.0pre3.501614-windows64-501614.tar.bz2 name windows64 version - 1.0pre3.500710 + 1.0pre3.501614 google_breakpad -- cgit v1.2.3 From 7359ec3ed8bef0eca971f380e6d0a28a26705bf9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 20 Dec 2016 16:46:06 -0500 Subject: DRTVWR-418: Temporarily suppress Havok in darwin64 builds. --- autobuild.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 41112095e7..9c1ec75c10 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3420,6 +3420,7 @@ -G Xcode + -DHAVOK:BOOL=FALSE default @@ -3482,6 +3483,7 @@ -G Xcode + -DHAVOK:BOOL=FALSE name -- cgit v1.2.3 From 546ead3d61d7c8d239fca461aaacf7315a26fea6 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Dec 2016 16:02:31 -0500 Subject: DRTVWR-418: Update to llphysicsextensions 501678, 501679 --- autobuild.xml | 104 ++++++++-------------------------------------------------- 1 file changed, 14 insertions(+), 90 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 9c1ec75c10..f05a665a01 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2141,52 +2141,26 @@ llphysicsextensions_source platforms - darwin - - archive - - hash - 01a7cc9d0e56238a9abedd7a41ccd0a3 - hash_algorithm - md5 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/llphysicsextensions/rev/313564/arch/Darwin/installer/llphysicsextensions_source-1.0.313564-darwin-313564.tar.bz2 - - name - darwin - darwin64 archive hash - 7ddbd5e4042c8cd4b92f4ec4f008c2de + e2b519ee7538b25877e34ede6864a250 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1429/3171/llphysicsextensions_source-1.0.501416-darwin64-501416.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1691/3748/llphysicsextensions_source-1.0.501678-darwin64-501678.tar.bz2 name darwin64 - linux - - archive - - hash - 18ebea18be4cf0d3da4a6bb73787395c - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/p64_llphysicsextensions/rev/314244/arch/Linux/installer/llphysicsextensions_source-1.0.314244-linux-314244.tar.bz2 - - name - linux - linux64 archive hash - e106565f44656db9824a6b7d0f316131 + 9b2c1f53f7f1add01af1e7cfa737e20e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1427/3161/llphysicsextensions_source-1.0.501416-linux64-501416.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1689/3734/llphysicsextensions_source-1.0.501678-linux64-501678.tar.bz2 name linux64 @@ -2196,28 +2170,16 @@ archive hash - a5330ca28e7a18df3f54213e6dbb1ea6 + 5e8cb92ae79c9435b98e444322ec5798 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1433/3191/llphysicsextensions_source-1.0.501416-windows-501416.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1696/3763/llphysicsextensions_source-1.0.501678-windows-501678.tar.bz2 name windows - windows64 - - archive - - hash - 159bc42e08f1797a613d914d1921cb46 - url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1432/3186/llphysicsextensions_source-1.0.501416-windows64-501416.tar.bz2 - - name - windows64 - version - 1.0.501416 + 1.0.501678 llphysicsextensions_stub @@ -2231,52 +2193,26 @@ llphysicsextensions_stub platforms - darwin - - archive - - hash - c8c6e5867d1ead7ad452a3359b22cf44 - hash_algorithm - md5 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/llphysicsextensions/rev/313563/arch/Darwin/installer/llphysicsextensions_stub-1.0.313563-darwin-313563.tar.bz2 - - name - darwin - darwin64 archive hash - b405d183061dec751ee9e3d8ece141ee + 32309a20161f54f42d08f7bc1e7fcf01 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1428/3166/llphysicsextensions_stub-1.0.501415-darwin64-501415.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1692/3749/llphysicsextensions_stub-1.0.501679-darwin64-501679.tar.bz2 name darwin64 - linux - - archive - - hash - f7dc825d13dec920a36641823f87dd94 - url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/p64_llphysicsextensions/rev/314246/arch/Linux/installer/llphysicsextensions_stub-1.0.314246-linux-314246.tar.bz2 - - name - linux - linux64 archive hash - 4581b01a352a66ba6ad62a536b12b8cb + 58af530891721f3690a4dce9a8c73190 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1426/3156/llphysicsextensions_stub-1.0.501415-linux64-501415.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1690/3739/llphysicsextensions_stub-1.0.501679-linux64-501679.tar.bz2 name linux64 @@ -2286,28 +2222,16 @@ archive hash - 0b0a911847d4784b49ea548ac4fe53d5 + c59cb5d1dd96ab51f87cd0cf202304dd url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1431/3181/llphysicsextensions_stub-1.0.501415-windows-501415.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1695/3757/llphysicsextensions_stub-1.0.501679-windows-501679.tar.bz2 name windows - windows64 - - archive - - hash - 546c9e9554a6204bb0c3f0c79b7a34cb - url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1430/3176/llphysicsextensions_stub-1.0.501415-windows64-501415.tar.bz2 - - name - windows64 - version - 1.0.501415 + 1.0.501679 mesa -- cgit v1.2.3 From aa2aa5e2da896a4ab96da41b878eb39e0dde8f35 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Dec 2016 20:51:18 -0500 Subject: 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. --- autobuild.xml | 2 -- 1 file changed, 2 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f05a665a01..2bf12fcba0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3344,7 +3344,6 @@ -G Xcode - -DHAVOK:BOOL=FALSE default @@ -3407,7 +3406,6 @@ -G Xcode - -DHAVOK:BOOL=FALSE name -- cgit v1.2.3