diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-07 10:14:33 -0500 |
| commit | 61e3c95dbf8282dbce5455a7adc466d9c2108a13 (patch) | |
| tree | 1d7f029348b6a5c5c66413d00898190fc338e8c2 /build.sh | |
| parent | 38ab28511473fb6882bab0d5a1ce3f372c48a171 (diff) | |
| parent | 09c01c4e925833873a83665fe0642637b65e547e (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'build.sh')
| -rw-r--r-- | build.sh | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -170,13 +170,7 @@ do mkdir -p "$build_dir" if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 then - if $build_link_parallel - then - begin_section BuildParallel - ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) & - build_processes="$build_processes $!" - end_section BuildParallel - elif $build_coverity + if $build_coverity then mkdir -p "$build_dir/cvbuild" coverity_config=`cygpath --windows "$coverity_dir/config/coverity_config.xml"` @@ -198,7 +192,6 @@ do begin_section CovAnalyze\ &&\ "$coverity_dir"/bin/cov-analyze\ - --cxx\ --security\ --concurrency\ --dir "$coverity_tmpdir"\ @@ -209,14 +202,14 @@ do begin_section CovCommit\ &&\ "$coverity_dir"/bin/cov-commit-defects\ - --product "$coverity_product"\ + --stream "$coverity_product"\ --dir "$coverity_tmpdir"\ - --remote "$coverity_server"\ + --host "$coverity_server"\ --strip-path "$coverity_root"\ --target "$branch/$arch"\ --version "$revision"\ --description "$repo: $variant $revision"\ - --user admin --password admin\ + --user admin --password coverity\ >> "$build_log" 2>&1\ || record_failure "Coverity Build Failed" # since any step could have failed, rely on the enclosing block to close any pending sub-blocks @@ -227,6 +220,12 @@ do then upload_item log "$build_dir"/cvbuild/build-log.txt text/plain fi + elif $build_link_parallel + then + begin_section BuildParallel + ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) & + build_processes="$build_processes $!" + end_section BuildParallel else begin_section "Build$variant" build "$variant" "$build_dir" >> "$build_log" 2>&1 |