From 76f841c0f76b4f1ee680845fc649d974ebfc6057 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 9 Dec 2016 15:16:55 -0500 Subject: DRTVWR-418: Update to llphysicsextensions_* 501415, 501416 --- autobuild.xml | 62 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 4ccbd25e60..0531f60c79 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2148,9 +2148,9 @@ archive hash - 8d66b068425d2cbc65949c83d7f37d23 + 7ddbd5e4042c8cd4b92f4ec4f008c2de url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/486/1031/llphysicsextensions_source-1.0.500392-darwin64-500392.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1429/3171/llphysicsextensions_source-1.0.501416-darwin64-501416.tar.bz2 name darwin64 @@ -2172,9 +2172,9 @@ archive hash - 20279e8be7f8971c59f0b8f6aa513098 + e106565f44656db9824a6b7d0f316131 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/463/980/llphysicsextensions_source-1.0.500392-linux64-500392.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1427/3161/llphysicsextensions_source-1.0.501416-linux64-501416.tar.bz2 name linux64 @@ -2184,9 +2184,9 @@ archive hash - 0ac91b8fadeebb767d8c7a4ab5272319 + a5330ca28e7a18df3f54213e6dbb1ea6 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/508/1090/llphysicsextensions_source-1.0.500392-windows-500392.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1433/3191/llphysicsextensions_source-1.0.501416-windows-501416.tar.bz2 name windows @@ -2196,16 +2196,16 @@ archive hash - ec95c627af598b6db5be99cff5559699 + 159bc42e08f1797a613d914d1921cb46 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/507/1087/llphysicsextensions_source-1.0.500392-windows64-500392.tar.bz2 + 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.500392 + 1.0.501416 llphysicsextensions_stub @@ -2238,9 +2238,9 @@ archive hash - c7676595a2b49e41aa3e32bf99e5cf2f + b405d183061dec751ee9e3d8ece141ee url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1081/2505/llphysicsextensions_stub-1.0.501069-darwin64-501069.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1428/3166/llphysicsextensions_stub-1.0.501415-darwin64-501415.tar.bz2 name darwin64 @@ -2262,9 +2262,9 @@ archive hash - 430a1c16c2a0f999742411389e6bb50f + 4581b01a352a66ba6ad62a536b12b8cb url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1080/2500/llphysicsextensions_stub-1.0.501069-linux64-501069.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1426/3156/llphysicsextensions_stub-1.0.501415-linux64-501415.tar.bz2 name linux64 @@ -2274,9 +2274,9 @@ archive hash - 72b163adfc692d4930fa391043329c88 + 0b0a911847d4784b49ea548ac4fe53d5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1083/2511/llphysicsextensions_stub-1.0.501069-windows-501069.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1431/3181/llphysicsextensions_stub-1.0.501415-windows-501415.tar.bz2 name windows @@ -2286,16 +2286,16 @@ archive hash - b0a066c3fcee095843d9077ccbc8a75b + 546c9e9554a6204bb0c3f0c79b7a34cb url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1082/2508/llphysicsextensions_stub-1.0.501069-windows64-501069.tar.bz2 + 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.501069 + 1.0.501415 mesa @@ -3300,7 +3300,7 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE + -DADDRESS_SIZE:STRING=64 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE @@ -3321,7 +3321,7 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE + -DADDRESS_SIZE:STRING=64 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE @@ -3341,7 +3341,7 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE + -DADDRESS_SIZE:STRING=64 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE @@ -3362,7 +3362,7 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE + -DADDRESS_SIZE:STRING=64 -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE @@ -3627,7 +3627,7 @@ windows build_directory - build-vc120-$AUTOBUILD_ADDRSIZE + build-vc120-64 configurations RelWithDebInfo @@ -3643,7 +3643,7 @@ options /build - RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} + RelWithDebInfo|NOTWIN configure @@ -3655,7 +3655,7 @@ options -G - ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + NOTWIN default @@ -3676,7 +3676,7 @@ options /p:Configuration=RelWithDebInfo - /p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} + /p:Platform=NOTWIN /t:Build /p:useenv=true /verbosity:minimal @@ -3693,7 +3693,7 @@ options -G - ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + NOTWIN -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -3715,7 +3715,7 @@ options /build - Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} + Release|NOTWIN configure @@ -3727,7 +3727,7 @@ options -G - ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + NOTWIN name @@ -3746,7 +3746,7 @@ options /p:Configuration=Release - /p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} + /p:Platform=NOTWIN /t:Build /p:useenv=true /verbosity:minimal @@ -3763,7 +3763,7 @@ options -G - ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} + NOTWIN -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3 From 8a3ea42a21880eee21cb21c5f2a4ff4d444b04d9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 9 Dec 2016 15:45:49 -0500 Subject: DRTVWR-418: Fix autobuild.xml AGAIN --- autobuild.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 0531f60c79..c716cab805 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3300,7 +3300,7 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DADDRESS_SIZE:STRING=64 + -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE @@ -3321,7 +3321,7 @@ options -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo - -DADDRESS_SIZE:STRING=64 + -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE @@ -3341,7 +3341,7 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DADDRESS_SIZE:STRING=64 + -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE @@ -3362,7 +3362,7 @@ options -DCMAKE_BUILD_TYPE:STRING=Release - -DADDRESS_SIZE:STRING=64 + -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE @@ -3627,7 +3627,7 @@ windows build_directory - build-vc120-64 + build-vc120-$AUTOBUILD_ADDRSIZE configurations RelWithDebInfo @@ -3643,7 +3643,7 @@ options /build - RelWithDebInfo|NOTWIN + RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} configure @@ -3655,7 +3655,7 @@ options -G - NOTWIN + ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} default @@ -3676,7 +3676,7 @@ options /p:Configuration=RelWithDebInfo - /p:Platform=NOTWIN + /p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} /t:Build /p:useenv=true /verbosity:minimal @@ -3693,7 +3693,7 @@ options -G - NOTWIN + ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE @@ -3715,7 +3715,7 @@ options /build - Release|NOTWIN + Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} configure @@ -3727,7 +3727,7 @@ options -G - NOTWIN + ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} name @@ -3746,7 +3746,7 @@ options /p:Configuration=Release - /p:Platform=NOTWIN + /p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} /t:Build /p:useenv=true /verbosity:minimal @@ -3763,7 +3763,7 @@ options -G - NOTWIN + ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} -DUNATTENDED:BOOL=ON -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -- cgit v1.2.3 From 771c7dd3c00e2eecfaa7382e41abb3b643cda84a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 10 Dec 2016 12:12:51 -0500 Subject: DRTVWR-418: Update some copy commands for 3p library versions. --- indra/cmake/Copy3rdPartyLibs.cmake | 7 ++----- indra/cmake/EXPAT.cmake | 6 ++++++ indra/integration_tests/llimage_libtest/CMakeLists.txt | 10 ++++++---- indra/llcorehttp/CMakeLists.txt | 10 ++++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 4630246d06..14510d654f 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -162,10 +162,8 @@ elseif(DARWIN) libaprutil-1.0.dylib libaprutil-1.dylib libexception_handler.dylib - libexpat.1.5.2.dylib - libexpat.dylib + ${EXPAT_COPY} libGLOD.dylib - libhunspell-1.3.0.dylib libndofdev.dylib ) @@ -205,8 +203,7 @@ elseif(LINUX) libaprutil-1.so.0 libatk-1.0.so libdb-5.1.so - libexpat.so - libexpat.so.1 + ${EXPAT_COPY} libfreetype.so.6.6.2 libfreetype.so.6 libGLOD.so diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake index c1155531ff..cddc71b227 100644 --- a/indra/cmake/EXPAT.cmake +++ b/indra/cmake/EXPAT.cmake @@ -10,8 +10,14 @@ else (USESYSTEMLIBS) use_prebuilt_binary(expat) if (WINDOWS) set(EXPAT_LIBRARIES libexpatMT) + set(EXPAT_COPY libexpatMT.dll) else (WINDOWS) set(EXPAT_LIBRARIES expat) + if (DARWIN) + set(EXPAT_COPY libexpat.1.dylib libexpat.dylib) + else () + set(EXPAT_COPY libexpat.so.1 libexpat.so) + endif () endif (WINDOWS) set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) endif (USESYSTEMLIBS) diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index 44384532cd..13cf1f7bde 100644 --- a/indra/integration_tests/llimage_libtest/CMakeLists.txt +++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt @@ -115,10 +115,12 @@ if (DARWIN) COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ) - add_custom_command(TARGET llimage_libtest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexpat.1.5.2.dylib ${LLIMAGE_LIBTEST_DESTINATION_DIR} - DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexpat.1.5.2.dylib - ) + foreach(expat ${EXPAT_COPY}) + add_custom_command(TARGET llimage_libtest POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LLIMAGE_LIBTEST_DESTINATION_DIR} + DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} + ) + endforeach(expat) endif (DARWIN) if (WINDOWS) diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 14fe45c1ae..6232299674 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -174,10 +174,12 @@ if (DARWIN) COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ${LL_TEST_DESTINATION_DIR} DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexception_handler.dylib ) - add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/libexpat.1.5.2.dylib ${LL_TEST_DESTINATION_DIR} - DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/libexpat.1.5.2.dylib - ) + foreach(expat ${EXPAT_COPY}) + add_custom_command(TARGET INTEGRATION_TEST_llcorehttp PRE_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} ${LL_TEST_DESTINATION_DIR} + DEPENDS ${AUTOBUILD_INSTALL_DIR}/lib/release/${expat} + ) + endforeach(expat) endif (DARWIN) -- cgit v1.2.3 From 45a32ed14d8172a2df3e01bdcf820072d7532bc0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 12 Dec 2016 11:50:25 -0500 Subject: DRTVWR-418: Align minimum OS X version with viewer-build-variables. --- indra/cmake/Variables.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 3d0cb0a3c9..0ff37dedad 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -138,10 +138,11 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - - # now we only support Xcode 7.0 using 10.11 (El Capitan), minimum OS 10.7 (Lion) + + # The following must agree with + # https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables set(XCODE_VERSION 7.0) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) set(CMAKE_OSX_SYSROOT macosx10.11) set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0") -- cgit v1.2.3 From b4902eb82abf495241acda6a8b38b16d91629287 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 12 Dec 2016 15:14:03 -0500 Subject: DRTVWR-418: Update to jsoncpp build 501464: actual darwin64 build --- autobuild.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c716cab805..7b999d6def 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1502,9 +1502,9 @@ archive hash - ba30bc3d67ef22700b534b15505bf976 + 3564da2ab285a8652d2ee157d1f167e2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/606/1275/jsoncpp-0.5.0.500597-darwin64-500597.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1478/3283/jsoncpp-0.5.0.501464-darwin64-501464.tar.bz2 name darwin64 @@ -1526,9 +1526,9 @@ archive hash - a88378cb3019a47f3249243384d3c5da + 9a658ae561c75e60bd9c0cee56731d21 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/605/1270/jsoncpp-0.5.0.500597-linux64-500597.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1475/3274/jsoncpp-0.5.0.501464-linux64-501464.tar.bz2 name linux64 @@ -1538,9 +1538,9 @@ archive hash - 483ba51ff4060d02900adf8b7ca12e32 + ed25115f3e53e59d4d26e0953c273648 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/608/1281/jsoncpp-0.5.0.500597-windows-500597.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1476/3277/jsoncpp-0.5.0.501464-windows-501464.tar.bz2 name windows @@ -1550,16 +1550,16 @@ archive hash - 25694d8f71efba5479e0475cd1bf3c2f + b328db840fd28532be39556d130c9439 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/607/1278/jsoncpp-0.5.0.500597-windows64-500597.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1477/3284/jsoncpp-0.5.0.501464-windows64-501464.tar.bz2 name windows64 version - 0.5.0.500597 + 0.5.0.501464 kdu -- cgit v1.2.3 From 4ff25594588b04eb50b9df3ddb13fbebb73aca2f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 12 Dec 2016 20:02:11 -0500 Subject: DRTVWR-418: Update to breakpad 501475, first true 64-bit Mac build. --- autobuild.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 7b999d6def..8dc1167aeb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1062,9 +1062,9 @@ archive hash - 0b76c9551ae3ef1ede9a9abee865f55b + d6e7100e6b70fb964e8edd92721853a9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/568/1209/google_breakpad-1413.500560-darwin64-500560.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1487/3312/google_breakpad-1413.501475-darwin64-501475.tar.bz2 name darwin64 @@ -1086,9 +1086,9 @@ archive hash - 066ce05521a0e1cff2da8aeecfefd7f1 + 438d220b9572ec037edfc157f5f5424b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/567/1217/google_breakpad-1413.500560-linux64-500560.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1486/3327/google_breakpad-1413.501475-linux64-501475.tar.bz2 name linux64 @@ -1098,9 +1098,9 @@ archive hash - c6a4497fbf3af4e06f74d529f4f084b0 + 45da93800bec583e828453bbe52bd650 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/570/1220/google_breakpad-1413.500560-windows-500560.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1489/3320/google_breakpad-1413.501475-windows-501475.tar.bz2 name windows @@ -1110,16 +1110,16 @@ archive hash - 46409efe7425f637a7757c3a578e7baa + bd6d5227b776e0a323098d3c157fd03a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/569/1212/google_breakpad-1413.500560-windows64-500560.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1488/3319/google_breakpad-1413.501475-windows64-501475.tar.bz2 name windows64 version - 1413.500560 + 1413.501475 googlemock -- cgit v1.2.3 From a0110373068fbe7fc70d3eac9763f0f1b820a3d2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 13 Dec 2016 15:23:00 -0500 Subject: DRTVWR-418, BUG-41026: Double default coroutine stack size. Also make it Persist so if someone hand-edits it to try to find a more suitable size, they won't have to keep re-editing it for every session. --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fa39dd6c65..410782b8b2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2045,11 +2045,11 @@ Comment Size (in bytes) for each coroutine stack Persist - 0 + 1 Type S32 Value - 262144 + 524288 CrashOnStartup -- cgit v1.2.3 From d0e166fe8a803967bac081c9f6ac73e436a684f5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 13 Dec 2016 15:30:51 -0500 Subject: DRTVWR-418: Remove build_variables_repository_url from BuildParams. That should be set in TeamCity template hierarchy; don't override it. --- BuildParams | 1 - 1 file changed, 1 deletion(-) diff --git a/BuildParams b/BuildParams index a991781c58..f1886077e3 100755 --- a/BuildParams +++ b/BuildParams @@ -15,7 +15,6 @@ build_Linux_Doxygen = true # Need viewer-build-variables as well as other shared repositories buildscripts_shared_more_NAMEs="build_variables" -build_variables_repostory_url = "https://bitbucket.org/lindenlab/viewer-build-variables" ################################################################ #### Examples of how to set the viewer_channel #### -- cgit v1.2.3 From 3b34cfd93a5d6c1de7065f7688f80d3e5f879046 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 14 Dec 2016 09:12:33 -0500 Subject: DRTVWR-418: Derive certain CMAKE_XCODE_etc. vars from LL_BUILD. --- indra/cmake/Variables.cmake | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 0ff37dedad..99b19ff07a 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -141,17 +141,42 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # The following must agree with # https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables + # Reading $LL_BUILD is an attempt to directly use those switches. + if ("$ENV{LL_BUILD}" STREQUAL "") + message(FATAL_ERROR "Environment variable LL_BUILD must be set") + endif () + + string(REGEX MATCH "-mmacosx-version-min=([^ ]+)" scratch "$ENV{LL_BUILD}") + set(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}") + message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET = '${CMAKE_OSX_DEPLOYMENT_TARGET}'") + + string(REGEX MATCH "-stdlib=([^ ]+)" scratch "$ENV{LL_BUILD}") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "${CMAKE_MATCH_1}") + message(STATUS "CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY = '${CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY}'") + + string(REGEX MATCH " -g([^ ]*)" scratch "$ENV{LL_BUILD}") + set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "${CMAKE_MATCH_1}") + message(STATUS "CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT = '${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}'") + + string(REGEX MATCH "-O([^ ]*)" scratch "$ENV{LL_BUILD}") + set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL "${CMAKE_MATCH_1}") + message(STATUS "CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL = '${CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL}'") + + string(REGEX MATCHALL "[^ ]+" LL_BUILD_LIST "$ENV{LL_BUILD}") + list(FIND LL_BUILD_LIST "-iwithsysroot" sysroot_idx) + if ("${sysroot_idx}" LESS 0) + message(FATAL_ERROR "Environment variable LL_BUILD must contain '-iwithsysroot'") + endif () + math(EXPR sysroot_idx "${sysroot_idx} + 1") + list(GET LL_BUILD_LIST "${sysroot_idx}" CMAKE_OSX_SYSROOT) + message(STATUS "CMAKE_OSX_SYSROOT = '${CMAKE_OSX_SYSROOT}'") + set(XCODE_VERSION 7.0) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) - set(CMAKE_OSX_SYSROOT macosx10.11) set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0") - set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL 3) set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO) set(CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO) set(CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS ssse3) - set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") - set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) set(CMAKE_OSX_ARCHITECTURES "${ARCH}") string(REPLACE "i686" "i386" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}") -- cgit v1.2.3 From 61fcda2c02414f8fe79c8e74b4ed37c2d707eefd Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 15 Dec 2016 09:12:22 -0500 Subject: DRTVWR-418: Update to llceflib 501501 with darwin64 package --- autobuild.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8dc1167aeb..6b7f89c4a8 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2087,16 +2087,28 @@ name darwin + darwin64 + + archive + + hash + 9fb85eff4118913543acde89bcb9a9c1 + url + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1512/3413/llceflib-1.6.0.501501-darwin64-501501.tar.bz2 + + name + darwin64 + windows archive hash - 640cd808de734d9a6ca564475d951980 + 9d19271829a372e028dd3c75605ded9c hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1121/2604/llceflib-1.5.3.501109-windows-501109.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1518/3437/llceflib-1.6.0.501501-windows-501501.tar.bz2 name windows @@ -2106,16 +2118,16 @@ archive hash - f4b75f37ba344db3efeddfafff10f5f9 + da1835b11be4442f22fef36820ad46ac url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1120/2601/llceflib-1.5.3.501109-windows64-501109.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1517/3434/llceflib-1.6.0.501501-windows64-501501.tar.bz2 name windows64 version - 1.5.3.501109 + 1.6.0.501501 llphysicsextensions_source -- cgit v1.2.3 From 3cf542d81d378112ba98472e8315f0dd9dd4342a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 15 Dec 2016 09:35:12 -0500 Subject: DRTVWR-418: Store std::string::find() result in size_t, not U32. In a 64-bit build, std::string::npos is way bigger than a U32. --- indra/llvfs/lldir_mac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index 4038c92465..30a1ac975e 100644 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp @@ -94,7 +94,7 @@ LLDir_Mac::LLDir_Mac() // MBW -- This keeps the mac application from finding other things. // If this is really for skins, it should JUST apply to skins. - U32 build_dir_pos = mExecutableDir.rfind("/build-darwin-"); + std::size_t build_dir_pos = mExecutableDir.rfind("/build-darwin-"); if (build_dir_pos != std::string::npos) { // ...we're in a dev checkout -- cgit v1.2.3 From 89cd49f60f87852d94b3c21ef70e3fa2ed990e51 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 15 Dec 2016 16:41:30 -0500 Subject: DRTVWR-418: -Wl,-no_compact_unwind switch breaks exception catching! In a clang 64-bit compile, with that switch set in CMAKE_CXX_LINK_FLAGS, we cannot catch any user exception. This shows up right away because TUT relies on internal exceptions to walk through test() test methods, but of course being unable to catch any exceptions in the viewer would be just as bad. A quick Google search turned up lots of people mentioning -no_compact_unwind without finding any documentation about what it's supposed to be good for. But since no tests work with it, whereas they work without it -- kill it. --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 6734f9585c..46dd8739bc 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -202,7 +202,7 @@ endif (LINUX) if (DARWIN) add_definitions(-DLL_DARWIN=1) - set(CMAKE_CXX_LINK_FLAGS "-Wl,-no_compact_unwind -Wl,-headerpad_max_install_names,-search_paths_first") + set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") set(DARWIN_extra_cstar_flags "-g -Wno-unused-local-typedef -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}") -- cgit v1.2.3