diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-21 09:32:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-21 09:32:10 -0400 |
| commit | d26356d7e16191da90cae23d3871d4e7289e175f (patch) | |
| tree | 99cae9537e050eb4ca324bc0dff3438819d7feb3 | |
| parent | dcc57bbb0e684e548cda625a87738aa241ff37b0 (diff) | |
| parent | 6d86a36b848d6bd1cc320a270c443ccb56bfae52 (diff) | |
merge changes for storm-1519
| -rw-r--r-- | BuildParams | 5 | ||||
| -rwxr-xr-x | build.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/BuildParams b/BuildParams index 9433e335fe..ad2f71e336 100644 --- a/BuildParams +++ b/BuildParams @@ -14,8 +14,8 @@ public_build = true # skip windows debug build until we can get a fix in. build_CYGWIN_Debug = false -# Update Public Inworld Build Status Indicators -email_status_this_is_os = false +# Update Public Inworld Build Status Indicators (setting should mirror "public_build") +email_status_this_is_os = true # Limit extent of codeticket updates to revisions after... codeticket_since = 2.2.0-release @@ -163,6 +163,7 @@ viewer-asset-delivery-metrics.build_server_tests = false # Simon says # ======================================== simon_viewer-dev-private.public_build = false +simon_viewer-dev-private.email_status_this_is_os = false # eof @@ -209,7 +209,7 @@ do end_section BuildParallel else begin_section "Build$variant" - build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity" + build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p' if `cat "$build_dir/build_ok"` then echo so far so good. @@ -238,7 +238,7 @@ then begin_section "Build$variant" build_dir=`build_dir_$arch $variant` build_dir_stubs="$build_dir/win_setup/$variant" - tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" + tee -a $build_log < "$build_dir/build.log" | sed -n 's/^ *\(##teamcity.*\)/\1/p' if `cat "$build_dir/build_ok"` then echo so far so good. |