From 2428b484e3a6ce23eaf29bd93579252e8e303f69 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 17 Feb 2017 15:56:42 -0500 Subject: DRTVWR-418: Attempt to make sense of Havok.cmake Linux logic. Aside from crazy indentation, much of Havok.cmake is redundant testing of DEBUG_PREBUILT and conditional MESSAGE(STATUS ...) output, not to mention repeating stanzas for each of debug_dir, release_dir and relwithdebinfo_dir. Use local functions and foreach() to try to manage redundancy so the details of what it's actually trying to do don't get lost in the noise. --- indra/cmake/Havok.cmake | 124 +++++++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 69 deletions(-) diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 99e7334118..d67d3df9f3 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -49,89 +49,75 @@ unset(HK_DEBUG_LIBRARIES) unset(HK_RELEASE_LIBRARIES) unset(HK_RELWITHDEBINFO_LIBRARIES) +if (DEBUG_PREBUILT) + # DEBUG_EXEC() reports each execute_process() before invoking + function(DEBUG_EXEC) + message(STATUS ARGN) + execute_process(ARGN) + endfunction(DEBUG_EXEC) + # DEBUG_MESSAGE() displays debugging message + function(DEBUG_MESSAGE) + message(STATUS ARGN) + endfunction(DEBUG_MESSAGE) +else (DEBUG_PREBUILT) + # without DEBUG_PREBUILT, DEBUG_EXEC() is just execute_process() + function(DEBUG_EXEC) + execute_process(ARGN) + endfunction(DEBUG_EXEC) + # without DEBUG_PREBUILT, DEBUG_MESSAGE() is a no-op + function(DEBUG_MESSAGE) + endfunction(DEBUG_MESSAGE) +endif (DEBUG_PREBUILT) + # *TODO: Figure out why we need to extract like this... foreach(HAVOK_LIB ${HAVOK_LIBS}) - find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) - find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) - find_library(HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}) - - if(LINUX) - set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}") - set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}") - set(relwithdebinfo_dir "${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}/${HAVOK_LIB}") + find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) + find_library(HAVOK_RELEASE_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELEASE_LIBRARY_PATH}) + find_library(HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}) + + if(LINUX) + set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}") + set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}") + set(relwithdebinfo_dir "${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}/${HAVOK_LIB}") # Try to avoid extracting havok library each time we run cmake. if("${havok_${HAVOK_LIB}_extracted}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted") file(READ ${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted "havok_${HAVOK_LIB}_extracted") - if(DEBUG_PREBUILT) - message(STATUS "havok_${HAVOK_LIB}_extracted: \"${havok_${HAVOK_LIB}_extracted}\"") - endif(DEBUG_PREBUILT) + DEBUG_MESSAGE("havok_${HAVOK_LIB}_extracted: \"${havok_${HAVOK_LIB}_extracted}\"") endif("${havok_${HAVOK_LIB}_extracted}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted") if(${PREBUILD_TRACKING_DIR}/havok_source_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) - if(DEBUG_PREBUILT) - MESSAGE(STATUS "Extracting ${HAVOK_LIB}...") - endif(DEBUG_PREBUILT) - set(cmd "mkdir") - - if(DEBUG_PREBUILT) - MESSAGE(STATUS "${cmd} ${debug_dir}") - endif(DEBUG_PREBUILT) - exec_program( ${cmd} ${HAVOK_DEBUG_LIBRARY_PATH} ARGS ${debug_dir} OUTPUT_VARIABLE rv) - - if(DEBUG_PREBUILT) - MESSAGE(STATUS "${cmd} ${release_dir}") - endif(DEBUG_PREBUILT) - exec_program( ${cmd} ${HAVOK_RELEASE_LIBRARY_PATH} ARGS ${release_dir} OUTPUT_VARIABLE rv) - - if(DEBUG_PREBUILT) - MESSAGE(STATUS "${cmd} ${relwithdebinfo_dir}") - endif(DEBUG_PREBUILT) - exec_program( ${cmd} ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH} ARGS ${relwithdebinfo_dir} OUTPUT_VARIABLE rv) - - set(cmd "ar") - set(arg " -xv") - set(arg "${arg} ../lib${HAVOK_LIB}.a") - if(DEBUG_PREBUILT) - MESSAGE(STATUS "cd ${debug_dir} && ${cmd} ${arg}") - endif(DEBUG_PREBUILT) - exec_program( ${cmd} ${debug_dir} ARGS ${arg} OUTPUT_VARIABLE rv) - - if(DEBUG_PREBUILT) - MESSAGE(STATUS "cd ${release_dir} && ${cmd} ${arg}") - endif(DEBUG_PREBUILT) - exec_program( ${cmd} ${release_dir} ARGS ${arg} OUTPUT_VARIABLE rv) - - if(DEBUG_PREBUILT) - MESSAGE(STATUS "cd ${relwithdebinfo_dir} && ${cmd} ${arg}") - endif(DEBUG_PREBUILT) - exec_program( ${cmd} ${relwithdebinfo_dir} ARGS ${arg} OUTPUT_VARIABLE rv) + DEBUG_MESSAGE("Extracting ${HAVOK_LIB}...") + + foreach(lib debug_dir release_dir relwithdebinfo_dir) + DEBUG_EXEC("mkdir" lib) + DEBUG_EXEC("ar" "-xv" "../lib${HAVOK_LIB}.a" + WORKING_DIRECTORY lib) + endforeach(lib) # Just assume success for now. set(havok_${HAVOK_LIB}_extracted 0) file(WRITE ${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted "${havok_${HAVOK_LIB}_extracted}") - endif(${PREBUILD_TRACKING_DIR}/havok_source_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) - - file(GLOB extracted_debug "${debug_dir}/*.o") - file(GLOB extracted_release "${release_dir}/*.o") - file(GLOB extracted_relwithdebinfo "${relwithdebinfo_dir}/*.o") - - if(DEBUG_PREBUILT) - MESSAGE(STATUS "extracted_debug ${debug_dir}/*.o") - MESSAGE(STATUS "extracted_release ${release_dir}/*.o") - MESSAGE(STATUS "extracted_relwithdebinfo ${relwithdebinfo_dir}/*.o") - endif(DEBUG_PREBUILT) - - list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug}) - list(APPEND HK_RELEASE_LIBRARIES ${extracted_release}) - list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${extracted_relwithdebinfo}) - else(LINUX) - # Win32 - list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}}) - list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) - list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB}}) - endif (LINUX) + endif() + + file(GLOB extracted_debug "${debug_dir}/*.o") + file(GLOB extracted_release "${release_dir}/*.o") + file(GLOB extracted_relwithdebinfo "${relwithdebinfo_dir}/*.o") + + DEBUG_MESSAGE("extracted_debug ${debug_dir}/*.o") + DEBUG_MESSAGE("extracted_release ${release_dir}/*.o") + DEBUG_MESSAGE("extracted_relwithdebinfo ${relwithdebinfo_dir}/*.o") + + list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug}) + list(APPEND HK_RELEASE_LIBRARIES ${extracted_release}) + list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${extracted_relwithdebinfo}) + else(LINUX) + # Win32 + list(APPEND HK_DEBUG_LIBRARIES ${HAVOK_DEBUG_LIB_${HAVOK_LIB}}) + list(APPEND HK_RELEASE_LIBRARIES ${HAVOK_RELEASE_LIB_${HAVOK_LIB}}) + list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB}}) + endif (LINUX) endforeach(HAVOK_LIB) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) -- cgit v1.2.3 From 56d04963d46bda05d118764e3914740c318b09cf Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 17 Feb 2017 16:44:47 -0500 Subject: DRTVWR-418: Fix CMake syntax for Havok.cmake refactoring. --- indra/cmake/Havok.cmake | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index d67d3df9f3..243b9f5e34 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -50,25 +50,24 @@ unset(HK_RELEASE_LIBRARIES) unset(HK_RELWITHDEBINFO_LIBRARIES) if (DEBUG_PREBUILT) - # DEBUG_EXEC() reports each execute_process() before invoking - function(DEBUG_EXEC) - message(STATUS ARGN) - execute_process(ARGN) - endfunction(DEBUG_EXEC) # DEBUG_MESSAGE() displays debugging message function(DEBUG_MESSAGE) - message(STATUS ARGN) + # prints message args separated by semicolons rather than spaces, + # but making it pretty is a lot more work + message(STATUS "${ARGN}") endfunction(DEBUG_MESSAGE) else (DEBUG_PREBUILT) - # without DEBUG_PREBUILT, DEBUG_EXEC() is just execute_process() - function(DEBUG_EXEC) - execute_process(ARGN) - endfunction(DEBUG_EXEC) # without DEBUG_PREBUILT, DEBUG_MESSAGE() is a no-op function(DEBUG_MESSAGE) endfunction(DEBUG_MESSAGE) endif (DEBUG_PREBUILT) +# DEBUG_EXEC() reports each execute_process() before invoking +function(DEBUG_EXEC) + DEBUG_MESSAGE(${ARGN}) + execute_process(COMMAND ${ARGN}) +endfunction(DEBUG_EXEC) + # *TODO: Figure out why we need to extract like this... foreach(HAVOK_LIB ${HAVOK_LIBS}) find_library(HAVOK_DEBUG_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_DEBUG_LIBRARY_PATH}) @@ -89,10 +88,10 @@ foreach(HAVOK_LIB ${HAVOK_LIBS}) if(${PREBUILD_TRACKING_DIR}/havok_source_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0) DEBUG_MESSAGE("Extracting ${HAVOK_LIB}...") - foreach(lib debug_dir release_dir relwithdebinfo_dir) - DEBUG_EXEC("mkdir" lib) + foreach(lib ${debug_dir} ${release_dir} ${relwithdebinfo_dir}) + DEBUG_EXEC("mkdir" ${lib}) DEBUG_EXEC("ar" "-xv" "../lib${HAVOK_LIB}.a" - WORKING_DIRECTORY lib) + WORKING_DIRECTORY ${lib}) endforeach(lib) # Just assume success for now. -- cgit v1.2.3 From 038c555fc4254de62a477d1c83a2131970b0b2b5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 21 Feb 2017 17:12:27 -0500 Subject: DRTVWR-418: In viewer64-mac-havok fork, turn on Xcode 8 Havok. This is known not to work yet: the relevant Havok libraries are not being bundled with llphysicsextensions, therefore the viewer can't link with any Havok symbols. --- autobuild.xml | 16 ++++++---------- build.sh | 4 ++-- indra/cmake/Havok.cmake | 5 +++++ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 975a4ebd64..51beb0ddaf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1322,9 +1322,9 @@ archive hash - cbaa7619050123c3fd2a88959f88bd47 + bd749bc181e8d75718267bc0ecf4c5bf url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/749/1553/havok_source-2012.1-2-darwin64-500739.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/2750/6262/havok_source-2012.1-2-darwin64-502736.tar.bz2 name darwin64 @@ -1358,9 +1358,9 @@ archive hash - dab55cc0555d7126fda925e20af851ea + 03be19251601027841c767f723dae1d4 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1194/2807/havok_source-2012.1-2-windows-501181.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/2756/6286/havok_source-2012.1-2-windows-502736.tar.bz2 name windows @@ -1370,9 +1370,9 @@ archive hash - 7bbc1c3512a5665b7576b4b0357a9eb7 + de3884eeed32297845add77d5ecc7e6b url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1195/2816/havok_source-2012.1-2-windows64-501181.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/2755/6280/havok_source-2012.1-2-windows64-502736.tar.bz2 name windows64 @@ -3357,7 +3357,6 @@ -G Xcode - -DHAVOK:BOOL=OFF default @@ -3386,7 +3385,6 @@ -G Xcode - -DHAVOK:BOOL=OFF name @@ -3421,7 +3419,6 @@ -G Xcode - -DHAVOK:BOOL=OFF name @@ -3448,7 +3445,6 @@ -G Xcode - -DHAVOK:BOOL=OFF name diff --git a/build.sh b/build.sh index 9ca130b5d5..a8f4158bff 100755 --- a/build.sh +++ b/build.sh @@ -97,14 +97,14 @@ pre_build() # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build. RELEASE_CRASH_REPORTING=ON + HAVOK=ON SIGNING=() if [ "$arch" == "Darwin" ] - then HAVOK=OFF + then if [ "$variant" == "Release" ] then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") fi - else HAVOK=ON fi "$autobuild" configure --quiet -c $variant -- \ diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake index 243b9f5e34..811a126b8f 100644 --- a/indra/cmake/Havok.cmake +++ b/indra/cmake/Havok.cmake @@ -8,6 +8,11 @@ use_prebuilt_binary(havok-source) set(Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Source) list(APPEND Havok_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/havok/Demo) +# HK_DISABLE_IMPLICIT_VVECTOR3_CONVERSION suppresses an intended conversion +# function which Xcode scolds us will unconditionally enter infinite +# recursion if called. This hides that function. +add_definitions("-DHK_DISABLE_IMPLICIT_VVECTOR3_CONVERSION") + set(HAVOK_DEBUG_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/debug/havok-fulldebug) set(HAVOK_RELEASE_LIBRARY_PATH ${LIBS_PREBUILT_DIR}/lib/release/havok) -- cgit v1.2.3 From bd5d2625e9c1e3347d91ebc535faaaaa3d09c529 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 20 Mar 2017 21:45:28 -0400 Subject: DRTVWR-418: Update to havok-source build 503601. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e5814be547..038d3fcffc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1376,9 +1376,9 @@ archive hash - bd749bc181e8d75718267bc0ecf4c5bf + 814bed3b81820d83a184c0f0a805e92d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/2750/6262/havok_source-2012.1-2-darwin64-502736.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3613/9353/havok_source-2012.1-2-darwin64-503601.tar.bz2 name darwin64 @@ -1412,9 +1412,9 @@ archive hash - 03be19251601027841c767f723dae1d4 + 7d4517f7a601391e83ba2e08f2ea518f url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/2756/6286/havok_source-2012.1-2-windows-502736.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3621/9389/havok_source-2012.1-2-windows-503601.tar.bz2 name windows @@ -1424,9 +1424,9 @@ archive hash - de3884eeed32297845add77d5ecc7e6b + b15b374f49ce4ac910889f5b7e150c73 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/2755/6280/havok_source-2012.1-2-windows64-502736.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3614/9359/havok_source-2012.1-2-windows64-503601.tar.bz2 name windows64 -- cgit v1.2.3 From e625a65a5be42d517016714d297fb3e5df60d8fc Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 20 Apr 2017 19:45:17 -0400 Subject: DRTVWR-418: Boost fixed max size of temporary Mac volume used during construction of the eventual installation .dmg. With newer 64-bit Havok packages, we need more elbow room on the temporary volume. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3a8cd0c626..3792adc06c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -980,7 +980,7 @@ class DarwinManifest(ViewerManifest): # make sure we don't have stale files laying about self.remove(sparsename, finalname) - self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 1000 -layout SPUD' % { + self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 1100 -layout SPUD' % { 'sparse':sparsename, 'vol':volname}) -- cgit v1.2.3 From 504f1db9c9f975ce54d424d32876cc92a947be12 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 21 Apr 2017 09:12:11 -0400 Subject: DRTVWR-418: Update to havok-source build 504455. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index b409d67b5e..2802727196 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1376,9 +1376,9 @@ archive hash - 814bed3b81820d83a184c0f0a805e92d + 8c06877b3499cb68fce7acacd1b5f7a0 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3613/9353/havok_source-2012.1-2-darwin64-503601.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4467/13273/havok_source-2012.1-2-darwin64-504455.tar.bz2 name darwin64 @@ -1412,9 +1412,9 @@ archive hash - 7d4517f7a601391e83ba2e08f2ea518f + 1fe2d6f9c355c4b61d70ce65482440d5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3621/9389/havok_source-2012.1-2-windows-503601.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4468/13279/havok_source-2012.1-2-windows-504455.tar.bz2 name windows @@ -1424,9 +1424,9 @@ archive hash - b15b374f49ce4ac910889f5b7e150c73 + a8e92e72394b1d24e4700d4297ec6053 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/3614/9359/havok_source-2012.1-2-windows64-503601.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4469/13285/havok_source-2012.1-2-windows64-504455.tar.bz2 name windows64 -- cgit v1.2.3 From a5247189aad81a31f4e50d865cf7837336ecf5d9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 21 Apr 2017 12:26:30 -0400 Subject: DRTVWR-418: Update to havok-source build 504463. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 2802727196..f1d0cf37cf 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1376,9 +1376,9 @@ archive hash - 8c06877b3499cb68fce7acacd1b5f7a0 + 71a1a177654dc14242bb5ea96fbae0d7 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4467/13273/havok_source-2012.1-2-darwin64-504455.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4475/13298/havok_source-2012.1-2-darwin64-504463.tar.bz2 name darwin64 @@ -1412,9 +1412,9 @@ archive hash - 1fe2d6f9c355c4b61d70ce65482440d5 + b048e59efc0c51cb55c20445a2cb7944 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4468/13279/havok_source-2012.1-2-windows-504455.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4477/13310/havok_source-2012.1-2-windows-504463.tar.bz2 name windows @@ -1424,9 +1424,9 @@ archive hash - a8e92e72394b1d24e4700d4297ec6053 + 7a120851d55adefdea504af8b2905d31 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4469/13285/havok_source-2012.1-2-windows64-504455.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4476/13304/havok_source-2012.1-2-windows64-504463.tar.bz2 name windows64 -- cgit v1.2.3 From 62ecf7091821c37e89d79e94880fcf585f27ba5c Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 22 Apr 2017 17:37:03 -0400 Subject: DRTVWR-418: Make temporary .sparseimage drive bigger for signing. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3792adc06c..0d03965858 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -980,7 +980,7 @@ class DarwinManifest(ViewerManifest): # make sure we don't have stale files laying about self.remove(sparsename, finalname) - self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 1100 -layout SPUD' % { + self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 2000 -layout SPUD' % { 'sparse':sparsename, 'vol':volname}) -- cgit v1.2.3 From e4cd2028ea01f31a20296d407512159dc942f977 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 22 Apr 2017 18:45:18 -0400 Subject: DRTVWR-418: Binary search for a good size for temp Mac disk image --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0d03965858..4e516db121 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -980,7 +980,7 @@ class DarwinManifest(ViewerManifest): # make sure we don't have stale files laying about self.remove(sparsename, finalname) - self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 2000 -layout SPUD' % { + self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 1500 -layout SPUD' % { 'sparse':sparsename, 'vol':volname}) -- cgit v1.2.3 From fad8c7edd7da7e43b0129282c790daa8b4c04ffb Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 22 Apr 2017 19:51:40 -0400 Subject: DRTVWR-418: Binary search for a good size for temp Mac disk image --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4e516db121..2aaa041eda 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -980,7 +980,7 @@ class DarwinManifest(ViewerManifest): # make sure we don't have stale files laying about self.remove(sparsename, finalname) - self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 1500 -layout SPUD' % { + self.run_command('hdiutil create %(sparse)r -volname %(vol)r -fs HFS+ -type SPARSE -megabytes 1300 -layout SPUD' % { 'sparse':sparsename, 'vol':volname}) -- cgit v1.2.3 From 579fd1a958174e0b313744ad49a598a187ef91b3 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 Apr 2017 19:03:52 -0400 Subject: DRTVWR-418: Update havok-source to build 504680, with Havok fix. --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 85211414b6..168ef4aec7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1376,9 +1376,9 @@ archive hash - 71a1a177654dc14242bb5ea96fbae0d7 + a0c4405c9e44d4a0135fe20ba8cfbace url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4475/13298/havok_source-2012.1-2-darwin64-504463.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4693/14627/havok_source-2012.1-2-darwin64-504680.tar.bz2 name darwin64 @@ -1412,9 +1412,9 @@ archive hash - b048e59efc0c51cb55c20445a2cb7944 + 035572a1929be66f6c56468e0ef7fe74 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4477/13310/havok_source-2012.1-2-windows-504463.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4695/14637/havok_source-2012.1-2-windows-504680.tar.bz2 name windows @@ -1424,9 +1424,9 @@ archive hash - 7a120851d55adefdea504af8b2905d31 + d8525d2fbb9e0f7bc31427b47350e468 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4476/13304/havok_source-2012.1-2-windows64-504463.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4694/14634/havok_source-2012.1-2-windows64-504680.tar.bz2 name windows64 -- cgit v1.2.3 From cdbad842c276efda32b36aba1040e3205f0fc38c Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 26 Apr 2017 22:29:54 -0400 Subject: DRTVWR-418: Update llphysicsextensions_source to 504710, _stub to 504712. --- autobuild.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 168ef4aec7..6d6ad0aba6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2130,9 +2130,9 @@ archive hash - e2b519ee7538b25877e34ede6864a250 + 162a3fc9b66626072ec8679361b174f5 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1691/3748/llphysicsextensions_source-1.0.501678-darwin64-501678.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4722/14837/llphysicsextensions_source-1.0.504710-darwin64-504710.tar.bz2 name darwin64 @@ -2142,9 +2142,9 @@ archive hash - 9b2c1f53f7f1add01af1e7cfa737e20e + c1b43e99c5ddccc18b0e9cb288bf75e1 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1689/3734/llphysicsextensions_source-1.0.501678-linux64-501678.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4721/14828/llphysicsextensions_source-1.0.504710-linux64-504710.tar.bz2 name linux64 @@ -2154,16 +2154,16 @@ archive hash - 5e8cb92ae79c9435b98e444322ec5798 + dd85c9e0f5fa3ce483ea183db008c4bc url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/1696/3763/llphysicsextensions_source-1.0.501678-windows-501678.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4726/14858/llphysicsextensions_source-1.0.504710-windows-504710.tar.bz2 name windows version - 1.0.501678 + 1.0.504710 llphysicsextensions_stub @@ -2182,9 +2182,9 @@ archive hash - 32309a20161f54f42d08f7bc1e7fcf01 + 566aa2c6f5b2f40a8b0bedf90d9c6beb url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1692/3749/llphysicsextensions_stub-1.0.501679-darwin64-501679.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4723/14838/llphysicsextensions_stub-1.0.504712-darwin64-504712.tar.bz2 name darwin64 @@ -2194,9 +2194,9 @@ archive hash - 58af530891721f3690a4dce9a8c73190 + 711f4ec769e4b5f59ba25ee43c11bcbc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1690/3739/llphysicsextensions_stub-1.0.501679-linux64-501679.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4724/14846/llphysicsextensions_stub-1.0.504712-linux64-504712.tar.bz2 name linux64 @@ -2206,16 +2206,16 @@ archive hash - c59cb5d1dd96ab51f87cd0cf202304dd + d830aca10ea9396557b1e613c2736e49 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1695/3757/llphysicsextensions_stub-1.0.501679-windows-501679.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4725/14853/llphysicsextensions_stub-1.0.504712-windows-504712.tar.bz2 name windows version - 1.0.501679 + 1.0.504712 mesa -- cgit v1.2.3