streamline build scripts

releng.control/ant.sh

@@ -7,10 +7,22 @@
 
 if [ -n $BUILD_INITIALIZED ]
 then
+   pushd .
+   cd ${RELENG_CONTROL}
    source commonVariations.shsource
    source ${RELENG_CONTROL}/commonComputedVariables.shsource
+   popd
 fi
 
+a# 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}
+
 
 ANT_CMD=${ANT_HOME}/bin/ant
 

releng.control/cc_config.xml

@@ -38,7 +38,8 @@
         target="Build"
         useLogger="${env.USE_LOGGER}"
         useQuiet="${env.USE_QUIET}"
-        savelogdir="${env.LOG_DIR}/${project.name}" />
+        savelogdir="${env.LOG_DIR}/${project.name}"
+        antworkingdir="${env.ANT_WORKING}" />
     <plugin
         name="project"
         buildafterfailed="true">