summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-14 14:13:30 -0400
committerOz Linden <oz@lindenlab.com>2010-10-14 14:13:30 -0400
commitac3f7c2b6b72aa955c0aa1337b8f25c6f097b429 (patch)
treed5954adeccf8ef19e66cdc8275521a5ea195e3cb /build.sh
parent1bd19e8ffe99c4a2d0df8936bf01a63ebc05258f (diff)
parent7ea2a1f9cc998396f437ec2535ddb1d51cce46b1 (diff)
Automated merge with file:///Users/oz/Work/viewer-beta
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 88faf12473..9b4d4a16dc 100755
--- a/build.sh
+++ b/build.sh
@@ -114,11 +114,15 @@ then
if [ -x "$top/../buildscripts/hg/bin/build.sh" ]
then
exec "$top/../buildscripts/hg/bin/build.sh" "$top"
+ elif [ -r "$top/README" ]
+ then
+ cat "$top/README"
+ exit 1
else
cat <<EOF
This script, if called in a development environment, requires that the branch
independent build script repository be checked out next to this repository.
-This repository is located at http://hg.lindenlab.com/parabuild/buildscripts
+This repository is located at http://hg.secondlife.com/buildscripts
EOF
exit 1
fi
@@ -284,6 +288,7 @@ then
succeeded=$build_coverity
else
upload_item installer "$package" binary/octet-stream
+ upload_item quicklink "$package" binary/octet-stream
# Upload crash reporter files.
case "$last_built_variant" in