From 3b62401cf5119d81f0225507641c84201aaecd00 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 3 Jan 2017 15:54:37 -0500 Subject: DRTVWR-418: Remove -DENABLE_SIGNING and -DSIGNING_IDENTITY from autobuild.xml's darwin64 Release and ReleaseOS build (xcodebuild) command. -D passed to xcodebuild does NOT set CMake variables. These switches, in this place, have never worked as intended. --- autobuild.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 2bf12fcba0..e0e43bbb46 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3392,8 +3392,6 @@ Release -project SecondLife.xcodeproj - -DENABLE_SIGNING:BOOL=YES - -DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc. configure @@ -3419,10 +3417,8 @@ xcodebuild options - -configuration Release - -project SecondLife.xcodeproj - -DENABLE_SIGNING:BOOL=YES - -DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc. + -configurationRelease + -projectSecondLife.xcodeproj configure -- cgit v1.2.3 From 8b4022f041c0ae726894e09460fa5358495a8a0f Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 4 Jan 2017 09:27:36 -0500 Subject: DRTVWR-418: Consume autobuild_configure_parameters in build.sh. --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 531be4f81d..ee59892908 100755 --- a/build.sh +++ b/build.sh @@ -114,6 +114,7 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ + $autobuild_configure_parameters \ || fatal "$variant configuration failed" end_section "Configure $variant" -- cgit v1.2.3 From 24d2c4ae489f21271a6b134abd3c9f78af887ed9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 4 Jan 2017 12:04:33 -0500 Subject: DRTVWR-418: Harmless change to kick TeamCity build. --- indra/llappearance/llavatarappearance.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 2f0b583ed2..ab6d77dd9b 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -2126,4 +2126,3 @@ LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BO } } - -- cgit v1.2.3 From 052900045255ce903f081fd8b3d0f619f34df087 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 4 Jan 2017 14:15:54 -0500 Subject: DRTVWR-418: Set signing CMake switches in build.sh for proper quoting. --- build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index ee59892908..5d774fe7e5 100755 --- a/build.sh +++ b/build.sh @@ -98,9 +98,14 @@ pre_build() # 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. + SIGNING=() if [ "$arch" == "Darwin" ] then HAVOK=OFF RELEASE_CRASH_REPORTING=OFF + if [ "$variant" == "Release" ] + then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ + "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") + fi else HAVOK=ON RELEASE_CRASH_REPORTING=ON fi @@ -114,7 +119,7 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ - $autobuild_configure_parameters \ + "${SIGNING[@]}" || fatal "$variant configuration failed" end_section "Configure $variant" -- cgit v1.2.3 From 85438e6725c70ce8498dd16bf3afc265470ec983 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 4 Jan 2017 15:27:31 -0500 Subject: DRTVWR-418: Fix line-break problem; also explicitly request bash. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5d774fe7e5..718a36cd93 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This is the custom build script for the viewer # @@ -119,7 +119,7 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ - "${SIGNING[@]}" + "${SIGNING[@]}" \ || fatal "$variant configuration failed" end_section "Configure $variant" -- cgit v1.2.3 From 1fe8d04a46ba3414ddbb16cc3bc5de206d9490b0 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 5 Jan 2017 18:49:56 -0500 Subject: DRTVWR-418, MAINT-7038: Don't add double quotes to channel name. The CMake directive that passes VIEWER_CHANNEL to the C++ compiler as LL_VIEWER_CHANNEL was enclosing the VIEWER_CHANNEL value in double quotes. At this point in history, those double quotes literally become part of the LL_VIEWER_CHANNEL value, causing the viewer to construct a bad Viewer Version Manager query containing those double quotes. Removing them fixes the query. --- indra/cmake/BuildVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake index 6ffa698a1c..321aecf073 100644 --- a/indra/cmake/BuildVersion.cmake +++ b/indra/cmake/BuildVersion.cmake @@ -54,7 +54,7 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n endif ("${VIEWER_VERSION_REVISION}" STREQUAL "") set(VIEWER_CHANNEL_VERSION_DEFINES - "LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\"" + "LL_VIEWER_CHANNEL=${VIEWER_CHANNEL}" "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}" "LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}" "LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}" -- cgit v1.2.3 From f40bd0fac308b21319d84ee221cb8f81d369dd71 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 6 Jan 2017 17:03:35 -0500 Subject: DRTVWR-418, SL-619: Update to google_breakpad build 501824 and re-enable breakpad symbol generation. --- autobuild.xml | 24 +++++++++++++----------- build.sh | 5 +---- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e0e43bbb46..5f741e276e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1062,9 +1062,9 @@ archive hash - d6e7100e6b70fb964e8edd92721853a9 + 2d43c6a149cd9c89ba19e884579b1e25 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1487/3312/google_breakpad-1413.501475-darwin64-501475.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1836/4096/google_breakpad-1413.501824-darwin64-501824.tar.bz2 name darwin64 @@ -1086,9 +1086,9 @@ archive hash - 438d220b9572ec037edfc157f5f5424b + 6bddcc1ac470dd5eab459220102df9e9 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1486/3327/google_breakpad-1413.501475-linux64-501475.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1835/4114/google_breakpad-1413.501824-linux64-501824.tar.bz2 name linux64 @@ -1098,9 +1098,9 @@ archive hash - 45da93800bec583e828453bbe52bd650 + 6a7929c7280a5c9b528fdd334da5c2d1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1489/3320/google_breakpad-1413.501475-windows-501475.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1838/4108/google_breakpad-1413.501824-windows-501824.tar.bz2 name windows @@ -1110,16 +1110,16 @@ archive hash - bd6d5227b776e0a323098d3c157fd03a + 4fb761717f3ce6ccabdaeb009272b7ca url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1488/3319/google_breakpad-1413.501475-windows64-501475.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1837/4103/google_breakpad-1413.501824-windows64-501824.tar.bz2 name windows64 version - 1413.501475 + 1413.501824 googlemock @@ -3417,8 +3417,10 @@ xcodebuild options - -configurationRelease - -projectSecondLife.xcodeproj + -configuration + Release + -project + SecondLife.xcodeproj configure diff --git a/build.sh b/build.sh index 718a36cd93..9ca130b5d5 100755 --- a/build.sh +++ b/build.sh @@ -96,18 +96,15 @@ pre_build() && 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. + RELEASE_CRASH_REPORTING=ON SIGNING=() if [ "$arch" == "Darwin" ] then HAVOK=OFF - RELEASE_CRASH_REPORTING=OFF if [ "$variant" == "Release" ] then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") fi else HAVOK=ON - RELEASE_CRASH_REPORTING=ON fi "$autobuild" configure --quiet -c $variant -- \ -- cgit v1.2.3