prep for niceness
diff --git a/releng.control/ant.sh b/releng.control/ant.sh index 2fc0b09..3cdf07c 100644 --- a/releng.control/ant.sh +++ b/releng.control/ant.sh
@@ -8,10 +8,10 @@ if [ -z $BUILD_INITIALIZED ] then # if releng_control not set, we assume we are already in releng_control directory - if [ -z $RELENG_CONTROL ] - then + if [ -z $RELENG_CONTROL ] + then RELENG_CONROL=`pwd` - fi + fi pushd . cd ${RELENG_CONTROL} source commonVariations.shsource @@ -19,21 +19,14 @@ popd fi -# For most ant tasks, we want Java 4 to be default, -# so if not desired (such as for WTP 2.0 unit tests), -# then we have to spec Java 5 right there where we run +# For most ant tasks, we want Java 4 to be default, +# so if not desired (such as for WTP 2.0 unit tests), +# then we have to spec Java 5 right there where we run # the tests. -# Note: this must be Java 4, for now, for "customizeAccessRules" -# to work. I'll recompile it for Java 5 eventually, but it causes -# a problem, and a problem only on PPC machine/VM. -export JAVA_HOME=${JAVA_4_HOME} +# Note: this must be Java 4, for now, for "customizeAccessRules" +# to work. I'll recompile it for Java 5 eventually, but it causes +# a problem, and a problem only on PPC machine/VM. +export JAVA_HOME=${JAVA_4_HOME} -if [ -z $niceness ] -then - niceness=0 -fi - -echo "Launching ant at priority $niceness" ANT_CMD="${ANT_HOME}/bin/ant" -nice --adjustment=$niceness exec "$ANT_CMD" "$@" - +exec "$ANT_CMD" "$@"
diff --git a/releng.control/ant_low_priority.sh b/releng.control/ant_low_priority.sh index 6cb405e..fc97c7c 100644 --- a/releng.control/ant_low_priority.sh +++ b/releng.control/ant_low_priority.sh
@@ -1,3 +1,24 @@ #!/bin/sh -${RELENG_CONTROL}/ant.sh 10 $@ +# remember to leave no slashes on commonVariations in source command, +# so that users path is used to find it (first). But, path on +# commonComputedVariables means we expect to execute only our +# version + +if [ -z $BUILD_INITIALIZED ] +then +# if releng_control not set, we assume we are already in releng_control directory + if [ -z $RELENG_CONTROL ] + then + RELENG_CONROL=`pwd` + fi + pushd . + cd ${RELENG_CONTROL} + source commonVariations.shsource + source ${RELENG_CONTROL}/commonComputedVariables.shsource + popd +fi + + +echo "Running ant at priority 10" +exec nice --adjustment 10 "${RELENG_CONTROL}/ant.sh" "$@"