summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 88faf12473..b372168f98 100755
--- a/build.sh
+++ b/build.sh
@@ -59,6 +59,7 @@ pre_build()
-t $variant \
-G "$cmake_generator" \
configure \
+ -DGRID:STRING="$viewer_grid" \
-DVIEWER_CHANNEL:STRING="$viewer_channel" \
-DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
-DINSTALL_PROPRIETARY:BOOL=ON \
@@ -114,11 +115,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 +289,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