diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-09 11:07:50 -0500 |
| commit | b9cf73c29b4b87a391c78415e4c09c31b4ac045c (patch) | |
| tree | d843f4e78bc6874001cb81fc993cc59d0a179a83 /build.sh | |
| parent | a59c43f1adff35107e59fdfc3016d4329324bbaf (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -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 @@ -223,7 +228,7 @@ do fi else begin_section "Build$variant" - build "$variant" "$build_dir" > "$build_log" 2>&1 + build "$variant" "$build_dir" >> "$build_log" 2>&1 begin_section Tests grep --line-buffered "^##teamcity" "$build_log" end_section Tests |