Skip to content
Snippets Groups Projects
Commit 5cc46513 authored by Oz Linden's avatar Oz Linden
Browse files

remove experimental redirects

parent 97f11bc6
No related branches found
No related tags found
No related merge requests found
...@@ -101,8 +101,7 @@ pre_build() ...@@ -101,8 +101,7 @@ pre_build()
-DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \
-DGRID:STRING="\"$viewer_grid\"" \ -DGRID:STRING="\"$viewer_grid\"" \
-DLL_TESTS:BOOL="$run_tests" \ -DLL_TESTS:BOOL="$run_tests" \
-DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
2>&$stderr
end_section "Configure $variant" end_section "Configure $variant"
} }
...@@ -114,12 +113,12 @@ package_llphysicsextensions_tpv() ...@@ -114,12 +113,12 @@ package_llphysicsextensions_tpv()
if [ "$variant" = "Release" ] if [ "$variant" = "Release" ]
then then
llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml
"$autobuild" build --quiet --config-file $llpetpvcfg -c Tpv 2>&$stderr "$autobuild" build --quiet --config-file $llpetpvcfg -c Tpv
# capture the package file name for use in upload later... # capture the package file name for use in upload later...
PKGTMP=`mktemp -t pgktpv.XXXXXX` PKGTMP=`mktemp -t pgktpv.XXXXXX`
trap "rm $PKGTMP* 2>/dev/null" 0 trap "rm $PKGTMP* 2>/dev/null" 0
"$autobuild" package --quiet --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)" 2>&$stderr "$autobuild" package --quiet --config-file $llpetpvcfg --results-file "$(native_path $PKGTMP)"
tpv_status=$? tpv_status=$?
if [ -r "${PKGTMP}" ] if [ -r "${PKGTMP}" ]
then then
...@@ -141,7 +140,7 @@ build() ...@@ -141,7 +140,7 @@ build()
local variant="$1" local variant="$1"
if $build_viewer if $build_viewer
then then
"$autobuild" build --no-configure -c $variant 2>&$stderr "$autobuild" build --no-configure -c $variant
build_ok=$? build_ok=$?
# Run build extensions # Run build extensions
...@@ -150,7 +149,7 @@ build() ...@@ -150,7 +149,7 @@ build()
for extension in ${build_dir}/packages/build-extensions/*.sh for extension in ${build_dir}/packages/build-extensions/*.sh
do do
begin_section "Extension $extension" begin_section "Extension $extension"
. $extension 2>&$trace . $extension
end_section "Extension $extension" end_section "Extension $extension"
done done
fi fi
...@@ -227,7 +226,7 @@ do ...@@ -227,7 +226,7 @@ do
begin_section "Initialize $variant Build Directory" begin_section "Initialize $variant Build Directory"
rm -rf "$build_dir" rm -rf "$build_dir"
mkdir -p "$build_dir/tmp" 2>&$stderr mkdir -p "$build_dir/tmp"
end_section "Initialize $variant Build Directory" end_section "Initialize $variant Build Directory"
if pre_build "$variant" "$build_dir" if pre_build "$variant" "$build_dir"
...@@ -246,7 +245,7 @@ do ...@@ -246,7 +245,7 @@ do
then then
record_dependencies_graph # defined in buildscripts/hg/bin/build.sh record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
else else
record_event "TBD - no dependency graph for linux (probable python version dependency)" 1>&2 record_event "TBD - no dependency graph for linux (probable python version dependency)"
fi fi
end_section "Autobuild metadata" end_section "Autobuild metadata"
else else
...@@ -261,7 +260,7 @@ do ...@@ -261,7 +260,7 @@ do
fi fi
if [ -d "$build_dir/doxygen/html" ] if [ -d "$build_dir/doxygen/html" ]
then then
tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html" 2>&$stderr tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html"
upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
fi fi
;; ;;
...@@ -297,14 +296,13 @@ then ...@@ -297,14 +296,13 @@ then
dch --force-bad-version \ dch --force-bad-version \
--distribution unstable \ --distribution unstable \
--newversion "${VIEWER_VERSION}" \ --newversion "${VIEWER_VERSION}" \
"Automated build #$build_id, repository $branch revision $revision." \ "Automated build #$build_id, repository $branch revision $revision."
2>&$stderr
# build the debian package # build the debian package
$pkg_default_debuild_command 2>&$stderr || record_failure "\"$pkg_default_debuild_command\" failed." $pkg_default_debuild_command || record_failure "\"$pkg_default_debuild_command\" failed."
# Unmangle the changelog file # Unmangle the changelog file
hg revert debian/changelog 2>&$stderr hg revert debian/changelog
end_section "Build Viewer Debian Package" end_section "Build Viewer Debian Package"
...@@ -315,8 +313,8 @@ then ...@@ -315,8 +313,8 @@ then
done done
fi fi
# Move any .deb results. # Move any .deb results.
mkdir -p ../packages_public 2>&$stderr mkdir -p ../packages_public
mkdir -p ../packages_private 2>&$stderr mkdir -p ../packages_private
mv ${build_dir}/packages/*.deb ../packages_public 2>/dev/null || true mv ${build_dir}/packages/*.deb ../packages_public 2>/dev/null || true
mv ${build_dir}/packages/packages_private/*.deb ../packages_private 2>/dev/null || true mv ${build_dir}/packages/packages_private/*.deb ../packages_private 2>/dev/null || true
...@@ -336,7 +334,7 @@ then ...@@ -336,7 +334,7 @@ then
# doesn't make a remote repo again. # doesn't make a remote repo again.
for debian_repo_type in debian_repo debian_repo_private; do for debian_repo_type in debian_repo debian_repo_private; do
if [ -d "$build_log_dir/$debian_repo_type" ]; then if [ -d "$build_log_dir/$debian_repo_type" ]; then
mv $build_log_dir/$debian_repo_type $build_log_dir/${debian_repo_type}_pushed 2>&$stderr mv $build_log_dir/$debian_repo_type $build_log_dir/${debian_repo_type}_pushed
fi fi
done done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment