summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-08 16:11:54 -0500
committerDave Parks <davep@lindenlab.com>2010-09-08 16:11:54 -0500
commita114783a7b609711c691bcd37cdb81de369a6638 (patch)
tree09bb6ae5bd3e2e913ddeeca55067f787e51a2380 /build.sh
parent35ad7ace9071e73056690c1212b31cd001985b9f (diff)
parent4a8d59367a695fedff21a71d35bcad3f729f6060 (diff)
merge
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index 3903216246..878aa45ce3 100755
--- a/build.sh
+++ b/build.sh
@@ -222,7 +222,7 @@ do
fi
else
begin_section "Build$variant"
- build "$variant" "$build_dir" >> "$build_log" 2>&1
+ build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity"
if `cat "$build_dir/build_ok"`
then
echo so far so good.
@@ -251,7 +251,7 @@ then
begin_section "Build$variant"
build_dir=`build_dir_$arch $variant`
build_dir_stubs="$build_dir/win_setup/$variant"
- cat "$build_dir/build.log" >> "$build_log"
+ tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
if `cat "$build_dir/build_ok"`
then
echo so far so good.