diff options
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 37 |
1 files changed, 29 insertions, 8 deletions
@@ -15,6 +15,12 @@ # * The basic convention is that the build name can be mapped onto a mercurial URL, # which is also used as the "branch" name. +check_for() +{ + if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi + echo "$1 ${found_dict} '$2' " 1>&2 +} + build_dir_Darwin() { echo build-darwin-i386 @@ -59,6 +65,8 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" + check_for "Before 'autobuild configure'" ${build_dir}/packages/dictionaries + "$AUTOBUILD" configure -c $variant -- \ -DPACKAGE:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \ @@ -67,7 +75,10 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url - end_section "Pre$variant" + + check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries + + end_section "Pre$variant" } build() @@ -76,12 +87,17 @@ build() if $build_viewer then begin_section "Viewer$variant" + + check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries + if "$AUTOBUILD" build --no-configure -c $variant then echo true >"$build_dir"/build_ok else echo false >"$build_dir"/build_ok fi + check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries + end_section "Viewer$variant" fi } @@ -132,10 +148,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/" @@ -176,10 +188,10 @@ eval "$("$AUTOBUILD" source_environment)" # dump environment variables for debugging env|sort +check_for "Before 'autobuild install'" ${build_dir}/packages/dictionaries -# Install packages. -"$AUTOBUILD" install --skip-license-check +check_for "After 'autobuild install'" ${build_dir}/packages/dictionaries # Now run the build succeeded=true build_processes= @@ -195,10 +207,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 |