summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-22 15:11:37 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-22 15:11:37 -0500
commiteaeadf71e00ae8381ca3d68ece5f87a31fa8c46e (patch)
tree7cdbdfb6a3a01493765de861e415506e94658895
parent6ef555414dedca9db915ef71c320ed53090b1e8e (diff)
DRTVWR-418: If we don't produce a symbol file, don't try to upload it.
-rwxr-xr-xbuild.sh34
1 files 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