Skip to content
Snippets Groups Projects
Commit c5ce29c8 authored by Christian Goetze (CG)'s avatar Christian Goetze (CG)
Browse files

Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined.

parent 918caee1
No related branches found
No related tags found
No related merge requests found
...@@ -119,23 +119,26 @@ fi ...@@ -119,23 +119,26 @@ fi
# First three parts only, $revision will be appended automatically. # 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]*$//'` build_viewer_update_version_manager_version=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'`
export autobuild_dir="$here/../../../autobuild/bin/" if [ -z "$AUTOBUILD" ]
if [ -d "$autobuild_dir" ]
then then
export AUTOBUILD="$autobuild_dir"autobuild export autobuild_dir="$here/../../../autobuild/bin/"
if [ -x "$AUTOBUILD" ] if [ -d "$autobuild_dir" ]
then then
# *HACK - bash doesn't know how to pass real pathnames to native windows python export AUTOBUILD="$autobuild_dir"autobuild
case "$arch" in if [ -x "$AUTOBUILD" ]
CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;; then
esac # *HACK - bash doesn't know how to pass real pathnames to native windows python
case "$arch" in
CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;;
esac
else
record_failure "Not executable: $AUTOBUILD"
exit 1
fi
else else
record_failure "Not executable: $AUTOBUILD" record_failure "Not found: $autobuild_dir"
exit 1 exit 1
fi fi
else
record_failure "Not found: $autobuild_dir"
exit 1
fi fi
# load autbuild provided shell functions and variables # load autbuild provided shell functions and variables
...@@ -166,7 +169,7 @@ do ...@@ -166,7 +169,7 @@ do
rm -rf "$build_dir" rm -rf "$build_dir"
mkdir -p "$build_dir" mkdir -p "$build_dir"
mkdir -p "$build_dir/tmp" mkdir -p "$build_dir/tmp"
export TMP="$build_dir/tmp" #export TMP="$build_dir/tmp"
if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
then then
if $build_link_parallel if $build_link_parallel
......
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