diff --git a/releng.control/ant.sh b/releng.control/ant.sh index 45b66ed29b06d6f4ef73a310c894b913405204e6..a4cc44beacf0b3ac1995119ea493f8a4a58bc019 100644 --- a/releng.control/ant.sh +++ b/releng.control/ant.sh @@ -34,9 +34,7 @@ case "$javaversion" in *ppc*) ibmjvm=true;; esac -#values of the bootclasspath attribute used in ant javac calls. -bootclasspath="$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/jre/lib/jsse.jar" -bootclasspath_15="$JAVA5_HOME/jre/lib/rt.jar" + buildPaths="-DJ2SE-1.4=${bootclasspath} -DJ2SE-1.5=${bootclasspath_15}" diff --git a/releng.control/commonVariations.sh b/releng.control/commonVariations.sh index 9a5f6bff77e9b6324f31de0c93f1a8a77a694e60..4b801dee62f00ffe415a6bc40d94fc6d56c8a339 100644 --- a/releng.control/commonVariations.sh +++ b/releng.control/commonVariations.sh @@ -9,11 +9,30 @@ export BUILD_HOME=/shared/webtools export DISPLAY=127.0.0.1:1.0 export JAVA_4_DIR="IBMJava2-ppc-142" export JAVA_5_DIR="ibm-java2-ppc-50" -export BUILD_INITIALIZED="true" +# 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 +# second set are for IBM's VM's ... which is what we use +# 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_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:$JAVA_HOME/jre/lib/xml.jar" + +export BUILD_INITIALIZED="true" -echo "Project Home: ${PROJECT_HOME}" -echo "Build Home: ${BUILD_HOME}" -echo "DISPLAY: ${DISPLAY}" -echo "JAVA_4_DIR: ${JAVA_4_DIR}" -echo "JAVA_5_DIR: ${JAVA_5_DIR}" +echo " " +echo " Project Home: ${PROJECT_HOME}" +echo " Build Home: ${BUILD_HOME}" +echo " DISPLAY: ${DISPLAY}" +echo " " +echo " JAVA_4_DIR: ${JAVA_4_DIR}" +echo " ${bootclasspath}" +echo " " +echo " JAVA_5_DIR: ${JAVA_5_DIR}" +echo " ${bootclasspath_15}" +echo " "