diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
commit | a4913246770b58ed569021c484c213231aaae549 (patch) | |
tree | 0878deeaa86b2c3a28cbf325566e8489111523c1 /build.sh | |
parent | 80c2abddcfbcb578e70d220baa95aebdee3d529c (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
merge up to latest viewer-release
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -135,10 +135,6 @@ if test -f scripts/update_version_files.py ; then end_section UpdateVer fi -# Now retrieve the version for use in the version manager -# First three parts only, $revision will be appended automatically. -build_viewer_update_version_manager_version=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'` - if [ -z "$AUTOBUILD" ] then export autobuild_dir="$here/../../../autobuild/bin/" @@ -180,9 +176,6 @@ eval "$("$AUTOBUILD" source_environment)" env|sort -# Install packages. -"$AUTOBUILD" install --skip-license-check - # Now run the build succeeded=true build_processes= @@ -198,10 +191,19 @@ do begin_section "Do$variant" build_dir=`build_dir_$arch $variant` build_dir_stubs="$build_dir/win_setup/$variant" + + begin_section "PreClean" rm -rf "$build_dir" + end_section "PreClean" + mkdir -p "$build_dir" mkdir -p "$build_dir/tmp" - #export TMP="$build_dir/tmp" + + # Install packages. + begin_section "AutobuildInstall" + "$AUTOBUILD" install --verbose --skip-license-check + end_section "AutobuildInstall" + if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 then if $build_link_parallel |