From 299615e9d6d991a0ae0a3f21b7acc55984dfbd1b Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 20 Jul 2011 11:48:19 -0700
Subject: Re-enable public build status indicators

---
 BuildParams | 5 +++--
 1 file changed, 3 insertions(+), 2 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
-- 
cgit v1.2.3


From 6d86a36b848d6bd1cc320a270c443ccb56bfae52 Mon Sep 17 00:00:00 2001
From: "Christian Goetze (CG)" <cg@lindenlab.com>
Date: Wed, 20 Jul 2011 11:48:57 -0700
Subject: Re-indent teamcity service messages when scanning build logs to fix
 incredibuild formatting.

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 4268c76e78..c7c89fe3c2 100755
--- a/build.sh
+++ b/build.sh
@@ -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.
-- 
cgit v1.2.3