livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18837: build.sh shouldn't even check for an installer. 

We no longer package the installer before this point, and we want to upload
symbol files even so.
master
Nat Goodspeed 2023-10-04 19:40:46 -04:00
parent 89191059ef
commit 1570153a84
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
build.sh
View File

@ -546,36 +546,29 @@ then
if $build_viewer if $build_viewer
then then
begin_section "Uploads" begin_section "Uploads"
package=$(installer_$arch) # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
if [ x"$package" != x ] if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
then then
if [ "$last_built_variant" = "Release" ] # BugSplat wants to see xcarchive.zip
then # e.g. build-darwin-x86_64/newview/Release/Second Life Test.xcarchive.zip
# nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file. symbol_file="${build_dir}/newview/${variant}/${viewer_channel}.xcarchive.zip"
if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] if [[ ! -f "$symbol_file" ]]
then then
# BugSplat wants to see xcarchive.zip # symbol tarball we prep for (e.g.) Breakpad
# e.g. build-darwin-x86_64/newview/Release/Second Life Test.xcarchive.zip symbol_file="$VIEWER_SYMBOL_FILE"
symbol_file="${build_dir}/newview/${variant}/${viewer_channel}.xcarchive.zip" fi
if [[ ! -f "$symbol_file" ]] # Upload crash reporter file
then symbolfile+=("$symbol_file")
# symbol tarball we prep for (e.g.) Breakpad fi
symbol_file="$VIEWER_SYMBOL_FILE"
fi
# Upload crash reporter file
symbolfile+=("$symbol_file")
fi
# Upload the llphysicsextensions_tpv package, if one was produced # Upload the llphysicsextensions_tpv package, if one was produced
# Only upload this package when building the private repo so the # Only upload this package when building the private repo so the
# artifact is private. # artifact is private.
if [[ "x$GITHUB_REPOSITORY" == "xsecondlife/viewer-private" && \ if [[ "x$GITHUB_REPOSITORY" == "xsecondlife/viewer-private" && \
-r "$build_dir/llphysicsextensions_package" ]] -r "$build_dir/llphysicsextensions_package" ]]
then then
llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
physicstpv+=("$llphysicsextensions_package") physicstpv+=("$llphysicsextensions_package")
fi
fi
fi fi
end_section "Uploads" end_section "Uploads"
else else