Skip to content
Snippets Groups Projects
Commit 83b5bf11 authored by Merov Linden's avatar Merov Linden
Browse files

Pull update from viewer-development

parents 023644b4 48c2b249
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 1 deletion
build.sh
+ 5
− 1
View file @ 83b5bf11
...@@ -114,11 +114,15 @@ then ...@@ -114,11 +114,15 @@ then
if [ -x "$top/../buildscripts/hg/bin/build.sh" ] if [ -x "$top/../buildscripts/hg/bin/build.sh" ]
then then
exec "$top/../buildscripts/hg/bin/build.sh" "$top" exec "$top/../buildscripts/hg/bin/build.sh" "$top"
elif [ -r "$top/README" ]
then
cat "$top/README"
exit 1
else else
cat <<EOF cat <<EOF
This script, if called in a development environment, requires that the branch This script, if called in a development environment, requires that the branch
independent build script repository be checked out next to this repository. 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 EOF
exit 1 exit 1
fi fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment