summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2012-07-12 02:09:44 +0000
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2012-07-12 02:09:44 +0000
commitcff01d2c5117434693d187ed558d1010d1d6a105 (patch)
treeda56a2dc05262c70a5ad8d390c13f83a3d191286
parentc0e83b392e4f244f7e4284cfc4285cc27f0b777b (diff)
Apparently the hack to get release and debug viewer builds into separate build configs means checking in build.sh is useless. Fixed the conditional around uploading the symbolfile to check instead, which seems to be the correct pattern.
-rwxr-xr-xbuild.sh24
1 files changed, 12 insertions, 12 deletions
diff --git a/build.sh b/build.sh
index e8d326f003..d19d8a5d6b 100755
--- a/build.sh
+++ b/build.sh
@@ -268,26 +268,26 @@ then
else
upload_item installer "$package" binary/octet-stream
upload_item quicklink "$package" binary/octet-stream
- mapfilepath=$build_dir/newview
- gzip $mapfilepath/secondlife-bin.MAP
- mapfile=secondlife-bin-$arch.MAP.gz
- mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile
- if [ x"$variant" = xRelease ]
- then
- upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream
- echo "Uploaded mapfile for $variant"
- else
- echo "Skipping mapfile upload for $variant"
- fi
[ -f summary.json ] && upload_item installer summary.json text/plain
- # Upload crash reporter files.
+ # Upload crash reporter files and symbolfile for public llphysicsextensions build.
case "$last_built_variant" in
Release)
for symbolfile in $symbolfiles
do
upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
done
+
+ mapfilepath=$build_dir/newview
+ gzip $mapfilepath/secondlife-bin.MAP
+ mapfile=secondlife-bin-$arch.MAP.gz
+ mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile
+ upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream
+ echo "Uploaded mapfile for $last_built_variant"
+
+ ;;
+ *)
+ echo "Skipping mapfile for $last_built_variant"
;;
esac