diff options
| -rw-r--r-- | autobuild.xml | 28 | ||||
| -rwxr-xr-x | build.sh | 13 | ||||
| -rw-r--r-- | indra/cmake/BuildVersion.cmake | 2 | ||||
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 1 |
4 files changed, 22 insertions, 22 deletions
diff --git a/autobuild.xml b/autobuild.xml index 2bf12fcba0..5f741e276e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1062,9 +1062,9 @@ <key>archive</key> <map> <key>hash</key> - <string>d6e7100e6b70fb964e8edd92721853a9</string> + <string>2d43c6a149cd9c89ba19e884579b1e25</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1487/3312/google_breakpad-1413.501475-darwin64-501475.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1836/4096/google_breakpad-1413.501824-darwin64-501824.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -1086,9 +1086,9 @@ <key>archive</key> <map> <key>hash</key> - <string>438d220b9572ec037edfc157f5f5424b</string> + <string>6bddcc1ac470dd5eab459220102df9e9</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1486/3327/google_breakpad-1413.501475-linux64-501475.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1835/4114/google_breakpad-1413.501824-linux64-501824.tar.bz2</string> </map> <key>name</key> <string>linux64</string> @@ -1098,9 +1098,9 @@ <key>archive</key> <map> <key>hash</key> - <string>45da93800bec583e828453bbe52bd650</string> + <string>6a7929c7280a5c9b528fdd334da5c2d1</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1489/3320/google_breakpad-1413.501475-windows-501475.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1838/4108/google_breakpad-1413.501824-windows-501824.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -1110,16 +1110,16 @@ <key>archive</key> <map> <key>hash</key> - <string>bd6d5227b776e0a323098d3c157fd03a</string> + <string>4fb761717f3ce6ccabdaeb009272b7ca</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1488/3319/google_breakpad-1413.501475-windows64-501475.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1837/4103/google_breakpad-1413.501824-windows64-501824.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1413.501475</string> + <string>1413.501824</string> </map> <key>googlemock</key> <map> @@ -3392,8 +3392,6 @@ <string>Release</string> <string>-project</string> <string>SecondLife.xcodeproj</string> - <string>-DENABLE_SIGNING:BOOL=YES</string> - <string>-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.</string> </array> </map> <key>configure</key> @@ -3419,10 +3417,10 @@ <string>xcodebuild</string> <key>options</key> <array> - <string>-configuration Release</string> - <string>-project SecondLife.xcodeproj</string> - <string>-DENABLE_SIGNING:BOOL=YES</string> - <string>-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.</string> + <string>-configuration</string> + <string>Release</string> + <string>-project</string> + <string>SecondLife.xcodeproj</string> </array> </map> <key>configure</key> @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This is the custom build script for the viewer # @@ -96,13 +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 -- \ @@ -114,6 +116,7 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ + "${SIGNING[@]}" \ || fatal "$variant configuration failed" end_section "Configure $variant" 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}" 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 } } - |