Added per-machine $more_setup_args configuration

This commit is contained in:
Eli Barzilay 2010-11-04 21:38:24 -04:00
parent df810e8e10
commit f11bb7795c

View File

@ -75,7 +75,8 @@ defbuild() {
# "D" first entry is for default field values (missing default makes the field # "D" first entry is for default field values (missing default makes the field
# required). Warning: an `eval "foo=\"bar\""' is used to assign values. # required). Warning: an `eval "foo=\"bar\""' is used to assign values.
msets "/machines/D" "workdir=/var/tmp" "moveto=" "copytobak=" \ msets "/machines/D" "workdir=/var/tmp" "moveto=" "copytobak=" \
"configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" "configure_args=" "LDFLAGS=" "ext_lib_paths=" "renice=" \
"more_setup_args="
# defbuild "ccs-solaris" "sparc-solaris" "moveto=/proj/racket" \ # defbuild "ccs-solaris" "sparc-solaris" "moveto=/proj/racket" \
# "ext_lib_paths=/arch/unix/packages/openssl-0.9.7e" # "ext_lib_paths=/arch/unix/packages/openssl-0.9.7e"
defbuild "pitcairn" "i386-win32" \ defbuild "pitcairn" "i386-win32" \
@ -1103,7 +1104,7 @@ DO_BUILD() { # inputs -- releasing
## -------------------------------------------------------------------------- ## --------------------------------------------------------------------------
releasing="$1"; shift releasing="$1"; shift
machineget platform workdir moveto copytobak \ machineget platform workdir moveto copytobak \
configure_args ext_lib_paths renice configure_args ext_lib_paths renice more_setup_args
if [[ "$renice" != "" ]]; then dont_exit _run renice "$renice" "$$"; fi if [[ "$renice" != "" ]]; then dont_exit _run renice "$renice" "$$"; fi
@ -1131,6 +1132,11 @@ DO_BUILD() { # inputs -- releasing
export SETUP_ARGS="$SETUP_ARGS -D" export SETUP_ARGS="$SETUP_ARGS -D"
fi fi
# additional setup args
if [[ "x$more_setup_args" != "x" ]]; then
export SETUP_ARGS="$SETUP_ARGS $more_setup_args"
fi
## -------------------------------------------------------------------------- ## --------------------------------------------------------------------------
if [[ "$platform" = "i386-win32" ]]; then if [[ "$platform" = "i386-win32" ]]; then
export PLTPLANETDIR="`cygpath -w \"$PLTPLANETDIR\"`" export PLTPLANETDIR="`cygpath -w \"$PLTPLANETDIR\"`"