diff options
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | BuildParams | 5 | ||||
| -rwxr-xr-x | build.sh | 6 |
3 files changed, 9 insertions, 3 deletions
@@ -11,6 +11,7 @@ syntax: glob *.DS_Store LICENSES indra/.distcc +build-linux-* build-darwin-* build-vc80/ indra/build-vc[0-9]* diff --git a/BuildParams b/BuildParams index 0a4271f7a8..5557b8db8a 100644 --- a/BuildParams +++ b/BuildParams @@ -233,5 +233,8 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com viewer-asset-delivery-metrics.build_server = false viewer-asset-delivery-metrics.build_server_tests = false - +#============================================================================== +# viewer-autobuild +#============================================================================== +viewer-autobuild.build_link_parallel = false # eof @@ -51,7 +51,6 @@ pre_build() { local variant="$1" begin_section "Pre$variant" - "$AUTOBUILD" install --skip-license-check "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON end_section "Pre$variant" } @@ -62,7 +61,7 @@ build() if $build_viewer then begin_section "Viewer$variant" - if "$AUTOBUILD" build -c $variant + if "$AUTOBUILD" build -c $variant --no-configure then echo true >"$build_dir"/build_ok else @@ -142,6 +141,9 @@ fi # load autbuild provided shell functions and variables eval "$("$AUTOBUILD" source_environment)" +# Install packages. +"$AUTOBUILD" install --skip-license-check + # Now run the build succeeded=true build_processes= |