VM jar names are vendor specific

releng.control/ant.sh

@@ -14,11 +14,8 @@ export LD_LIBRARY_PATH
 CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
 export CCDIR
 
-JAVA_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
-export JAVA_HOME
+export JAVA_HOME=${JAVA_4_HOME}
 
-JAVA5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
-export JAVA5_HOME
 
 ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
 export ANT_HOME

releng.control/commonVariations.sh

@@ -10,6 +10,9 @@ export DISPLAY=127.0.0.1:1.0
 export JAVA_4_DIR="IBMJava2-ppc-142"
 export JAVA_5_DIR="ibm-java2-ppc-50"
 
+JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
+JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
+
 # values of the bootclasspath attribute used in ant javac calls.
 # the names of these jars are VM vendor specific. the first set
 # below, commented out, are typical for sun VM's. The 
@@ -17,11 +20,11 @@ export JAVA_5_DIR="ibm-java2-ppc-50"
 # on the PPC machine, so we'll leave that as the defaults 
 # in this file. 
 
-#export bootclasspath="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar"
-#export bootclasspath_15="${JAVA5_HOME}/jre/lib/rt.jar"
+#export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
+#export bootclasspath_15="${JAVA_5_HOME}/jre/lib/rt.jar"
 
-export bootclasspath="${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_HOME}/jre/lib/xml.jar"
-export bootclasspath_15="${JAVA5_HOME}/jre/lib/core.jar:${JAVA5_HOME}/jre/lib/vm.jar:${JAVA5_HOME}/jre/lib/xml.jar"
+export bootclasspath="${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_4_HOME}/jre/lib/xml.jar"
+export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar"
 
 export BUILD_INITIALIZED="true"