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(-) 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 7a83f26323b192b09b4017b5f4f986511345bd36 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Dec 2016 19:11:58 -0500 Subject: DRTVWR-418: Temporarily disable Mac generate_breakpad_symbols.py. --- build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5c48b902d4..0b9b644cda 100755 --- a/build.sh +++ b/build.sh @@ -95,10 +95,17 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" + # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we + # figure out why it's breaking. + if [ "$arch" == "Darwin" ] + then RELEASE_CRASH_REPORTING=OFF + else RELEASE_CRASH_REPORTING=ON + fi + "$autobuild" configure --quiet -c $variant -- \ -DPACKAGE:BOOL=ON \ -DUNATTENDED:BOOL=ON \ - -DRELEASE_CRASH_REPORTING:BOOL=ON \ + -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -- 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 -- build.sh | 11 ++++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) 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 diff --git a/build.sh b/build.sh index 0b9b644cda..f826432d93 100755 --- a/build.sh +++ b/build.sh @@ -95,16 +95,20 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" + # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build. # nat 2016-12-21: disable generate_breakpad_symbols.py on Mac until we # figure out why it's breaking. if [ "$arch" == "Darwin" ] - then RELEASE_CRASH_REPORTING=OFF - else RELEASE_CRASH_REPORTING=ON + then HAVOK=OFF + RELEASE_CRASH_REPORTING=OFF + else HAVOK=ON + RELEASE_CRASH_REPORTING=ON fi "$autobuild" configure --quiet -c $variant -- \ -DPACKAGE:BOOL=ON \ -DUNATTENDED:BOOL=ON \ + -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ -DGRID:STRING="\"$viewer_grid\"" \ @@ -119,7 +123,8 @@ package_llphysicsextensions_tpv() { begin_section "PhysicsExtensions_TPV" tpv_status=0 - if [ "$variant" = "Release" ] + # nat 2016-12-21: without HAVOK, can't build PhysicsExtensions_TPV. + if [ "$variant" = "Release" -a "${HAVOK:-}" != "OFF" ] then test -r "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml" || fatal "No llphysicsextensions_tpv autobuild configuration found" tpvconfig=$(native_path "$build_dir/packages/llphysicsextensions/autobuild-tpv.xml") -- cgit v1.2.3 From e9f5ed6591fb5d2513b5065622b9e7dac6737913 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 22 Dec 2016 10:18:48 -0500 Subject: fix installer name function for Mac (and maybe Linux?) --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index f826432d93..7d0a961486 100755 --- a/build.sh +++ b/build.sh @@ -47,8 +47,8 @@ viewer_channel_suffix() installer_Darwin() { local package_name="$1" - local package_dir="$(build_dir_Darwin ${last_built_variant:-Release})/newview/" - local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i386\\.dmg\$" + local package_dir="newview/$(build_dir_Darwin ${last_built_variant:-Release})/" + local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$" # since the additional packages are built after the base package, # sorting oldest first ensures that the unqualified package is returned # even if someone makes a qualified name that duplicates the last word of the base name @@ -59,7 +59,7 @@ installer_Darwin() installer_Linux() { local package_name="$1" - local package_dir="$(build_dir_Linux ${last_built_variant:-Release})/newview/" + local package_dir="newview/$(build_dir_Linux ${last_built_variant:-Release})/" local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$" # since the additional packages are built after the base package, # sorting oldest first ensures that the unqualified package is returned @@ -381,7 +381,7 @@ then package=$(installer_$arch) if [ x"$package" = x ] || test -d "$package" then - record_event "??? mystery event $package // $build_coverity" + fatal "No installer found at '$package'" succeeded=$build_coverity else # Upload base package. -- cgit v1.2.3 From 6ef555414dedca9db915ef71c320ed53090b1e8e Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 22 Dec 2016 11:50:33 -0500 Subject: try again to actually fix the installer name function for Mac (and maybe Linux?) --- build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 7d0a961486..7efe6e3492 100755 --- a/build.sh +++ b/build.sh @@ -47,7 +47,8 @@ viewer_channel_suffix() installer_Darwin() { local package_name="$1" - local package_dir="newview/$(build_dir_Darwin ${last_built_variant:-Release})/" + local variant=${last_built_variant:-Release} + local package_dir="$(build_dir_Darwin)/newview/${variant}/" local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$" # since the additional packages are built after the base package, # sorting oldest first ensures that the unqualified package is returned @@ -59,7 +60,8 @@ installer_Darwin() installer_Linux() { local package_name="$1" - local package_dir="newview/$(build_dir_Linux ${last_built_variant:-Release})/" + local variant=${last_built_variant:-Release} + local package_dir="$(build_dir_Linux)/newview/${variant}/" local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$" # since the additional packages are built after the base package, # sorting oldest first ensures that the unqualified package is returned -- cgit v1.2.3 From 0131e8a0815826bda538908991d28e23624c0754 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 22 Dec 2016 13:54:39 -0500 Subject: one more try... also fixing setting of viewer_channel without quotes --- build.sh | 10 ++++------ indra/newview/CMakeLists.txt | 13 ++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build.sh b/build.sh index 7efe6e3492..130c620d23 100755 --- a/build.sh +++ b/build.sh @@ -47,8 +47,7 @@ viewer_channel_suffix() installer_Darwin() { local package_name="$1" - local variant=${last_built_variant:-Release} - local package_dir="$(build_dir_Darwin)/newview/${variant}/" + local package_dir="$(build_dir_Darwin)/newview/" local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$" # since the additional packages are built after the base package, # sorting oldest first ensures that the unqualified package is returned @@ -60,8 +59,7 @@ installer_Darwin() installer_Linux() { local package_name="$1" - local variant=${last_built_variant:-Release} - local package_dir="$(build_dir_Linux)/newview/${variant}/" + local package_dir="$(build_dir_Linux)/newview/" local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$" # since the additional packages are built after the base package, # sorting oldest first ensures that the unqualified package is returned @@ -112,7 +110,7 @@ pre_build() -DUNATTENDED:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ - -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ + -DVIEWER_CHANNEL:STRING="${viewer_channel}" \ -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ @@ -383,7 +381,7 @@ then package=$(installer_$arch) if [ x"$package" = x ] || test -d "$package" then - fatal "No installer found at '$package'" + fatal "No installer found from `pwd`" succeeded=$build_coverity else # Upload base package. diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index df855b0de2..f2eb8ff9d5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1770,7 +1770,7 @@ if (WINDOWS) --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} --grid=${GRID} - --channel=${VIEWER_CHANNEL} + "--channel=${VIEWER_CHANNEL}" --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/copy_touched.bat @@ -1833,7 +1833,7 @@ if (WINDOWS) --artwork=${ARTWORK_DIR} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} - --channel=${VIEWER_CHANNEL} + "--channel=${VIEWER_CHANNEL}" --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} @@ -1972,7 +1972,7 @@ if (LINUX) --artwork=${ARTWORK_DIR} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} - --channel=${VIEWER_CHANNEL} + "--channel=${VIEWER_CHANNEL}" --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged @@ -2000,7 +2000,7 @@ if (LINUX) --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged --grid=${GRID} - --channel=${VIEWER_CHANNEL} + "--channel=${VIEWER_CHANNEL}" --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} DEPENDS @@ -2059,7 +2059,7 @@ if (DARWIN) --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app --grid=${GRID} - --channel=${VIEWER_CHANNEL} + "--channel=${VIEWER_CHANNEL}" --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} DEPENDS @@ -2088,11 +2088,10 @@ if (DARWIN) --artwork=${ARTWORK_DIR} --build=${CMAKE_CURRENT_BINARY_DIR} --buildtype=${CMAKE_BUILD_TYPE} - --channel=${VIEWER_CHANNEL} --configuration=${CMAKE_CFG_INTDIR} --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app --grid=${GRID} - --channel=${VIEWER_CHANNEL} + "--channel=${VIEWER_CHANNEL}" --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched -- cgit v1.2.3 From eaeadf71e00ae8381ca3d68ece5f87a31fa8c46e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 22 Dec 2016 15:11:37 -0500 Subject: DRTVWR-418: If we don't produce a symbol file, don't try to upload it. --- build.sh | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/build.sh b/build.sh index 7efe6e3492..5639c93f40 100755 --- a/build.sh +++ b/build.sh @@ -405,21 +405,25 @@ then if [ "$last_built_variant" = "Release" ] then - # Upload crash reporter file - # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt - case "$arch" in - CYGWIN) - symbolfile="$build_dir/newview/Release/secondlife-symbols-windows-${AUTOBUILD_ADDRSIZE}.tar.bz2" - ;; - Darwin) - symbolfile="$build_dir/newview/Release/secondlife-symbols-darwin-${AUTOBUILD_ADDRSIZE}.tar.bz2" - ;; - Linux) - symbolfile="$build_dir/newview/Release/secondlife-symbols-linux-${AUTOBUILD_ADDRSIZE}.tar.bz2" - ;; - esac - python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$symbolfile" \ - || fatal "Upload of symbolfile failed" + # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file. + if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] + then + # Upload crash reporter file + # These names must match the set of VIEWER_SYMBOL_FILE in indra/newview/CMakeLists.txt + case "$arch" in + CYGWIN) + symbolfile="$build_dir/newview/Release/secondlife-symbols-windows-${AUTOBUILD_ADDRSIZE}.tar.bz2" + ;; + Darwin) + symbolfile="$build_dir/newview/Release/secondlife-symbols-darwin-${AUTOBUILD_ADDRSIZE}.tar.bz2" + ;; + Linux) + symbolfile="$build_dir/newview/Release/secondlife-symbols-linux-${AUTOBUILD_ADDRSIZE}.tar.bz2" + ;; + esac + python_cmd "$helpers/codeticket.py" addoutput "Symbolfile" "$symbolfile" \ + || fatal "Upload of symbolfile failed" + fi # Upload the llphysicsextensions_tpv package, if one was produced # *TODO: Make this an upload-extension -- cgit v1.2.3