diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2010-11-05 13:30:20 -0700 |
commit | 447dc782fd4d490387fd98e9fb41135038512767 (patch) | |
tree | b7875f5dd54d4068d777adbe90a3dd36b99a38eb /build.sh | |
parent | d5d4a065275d1db1093111222f29942ee171f81c (diff) | |
parent | 124a59263184391b0b4ec418c532b7a715e9b5a3 (diff) |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 3 |
1 files changed, 2 insertions, 1 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 \ @@ -227,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 |