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(+) (limited to 'build.sh') 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 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(-) (limited to 'build.sh') 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(-) (limited to 'build.sh') 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 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. --- build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'build.sh') 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