diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-30 12:00:29 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-09-30 12:00:29 -0700 |
| commit | 60f8c8279071b791fbc7179d8bc2bb9ca4880a03 (patch) | |
| tree | 20a513fdb383dfd36ca0dbe0a99eacd72faad835 /build.sh | |
| parent | 569f3f4b06fc2f5a0fa658a49d519428983403f9 (diff) | |
| parent | d95b08c4a6830fc8a2319e77242d8f76eb4cbdae (diff) | |
Merge
Diffstat (limited to 'build.sh')
| -rw-r--r-- | build.sh | 26 |
1 files changed, 21 insertions, 5 deletions
@@ -65,6 +65,7 @@ pre_build() -DINSTALL_PROPRIETARY:BOOL=ON \ -DLOCALIZESETUP:BOOL=ON \ -DPACKAGE:BOOL=ON + -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE end_section "Pre$variant" } @@ -148,11 +149,15 @@ build_viewer_update_version_manager_version=`scripts/get_version.py --viewer-ver cd indra succeeded=true build_processes= +last_built_variant= for variant in $variants do eval '$build_'"$variant" || continue eval '$build_'"$arch"_"$variant" || continue + # Only the last built arch is available for upload + last_built_variant="$variant" + begin_section "Do$variant" build_dir=`build_dir_$arch $variant` build_dir_stubs="$build_dir/win_setup/$variant" @@ -219,7 +224,10 @@ 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 if `cat "$build_dir/build_ok"` then echo so far so good. @@ -255,6 +263,9 @@ then else record_failure "Parallel build of \"$variant\" failed." fi + begin_section Tests + tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" + end_section Tests end_section "Build$variant" done end_section WaitParallel @@ -275,12 +286,17 @@ then succeeded=$build_coverity else upload_item installer "$package" binary/octet-stream + upload_item quicklink "$package" binary/octet-stream # Upload crash reporter files. - for symbolfile in $symbolfiles - do - upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream - done + case "$last_built_variant" in + Release) + for symbolfile in $symbolfiles + do + upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream + done + ;; + esac # Upload stub installers upload_stub_installers "$build_dir_stubs" |