diff options
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 34 |
1 files changed, 20 insertions, 14 deletions
@@ -59,12 +59,15 @@ pre_build() -t $variant \ -G "$cmake_generator" \ configure \ + -DGRID:STRING="$viewer_grid" \ -DVIEWER_CHANNEL:STRING="$viewer_channel" \ -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \ -DINSTALL_PROPRIETARY:BOOL=ON \ + -DRELEASE_CRASH_REPORTING:BOOL=ON \ -DLOCALIZESETUP:BOOL=ON \ -DPACKAGE:BOOL=ON \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE + -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ + -DLL_TESTS:BOOL="$run_tests" end_section "Pre$variant" } @@ -114,11 +117,15 @@ then if [ -x "$top/../buildscripts/hg/bin/build.sh" ] then exec "$top/../buildscripts/hg/bin/build.sh" "$top" + elif [ -r "$top/README" ] + then + cat "$top/README" + exit 1 else cat <<EOF This script, if called in a development environment, requires that the branch independent build script repository be checked out next to this repository. -This repository is located at http://hg.lindenlab.com/parabuild/buildscripts +This repository is located at http://hg.secondlife.com/buildscripts EOF exit 1 fi @@ -164,13 +171,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"` @@ -192,7 +193,6 @@ do begin_section CovAnalyze\ &&\ "$coverity_dir"/bin/cov-analyze\ - --cxx\ --security\ --concurrency\ --dir "$coverity_tmpdir"\ @@ -203,14 +203,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 @@ -221,9 +221,15 @@ 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 + build "$variant" "$build_dir" >> "$build_log" 2>&1 begin_section Tests grep --line-buffered "^##teamcity" "$build_log" end_section Tests |