Releng: fix typos concerning eclipse.tests.tmp
+ more JDK paths in build.properties
diff --git a/releng/build-scripts/build/OTDT-Build/build.properties b/releng/build-scripts/build/OTDT-Build/build.properties
index dbe17b3..e19e3f2 100644
--- a/releng/build-scripts/build/OTDT-Build/build.properties
+++ b/releng/build-scripts/build/OTDT-Build/build.properties
@@ -19,13 +19,13 @@
configs=linux,gtk,*
JavaSE-12=/shared/common/java/openjdk/jdk-12_x64-latest/lib/jrt-fs.jar
-JavaSE-11=/shared/common/java/openjdk/jdk-11_x64-latest/lib/jrt-fs.jar
+JavaSE-11=/opt/tools/java/openjdk/jdk-11/latest/lib/jrt-fs.jar
JavaSE-10=/shared/common/java/oracle/jdk-10_x64-latest/lib/jrt-fs.jar
JavaSE-9=/shared/common/java/oracle/jdk-9_x64-latest/lib/jrt-fs.jar
-JavaSE-1.8=/shared/common/jdk1.8.0_x64-latest/jre/lib/charsets.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/deploy.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/javaws.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jce.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jfr.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jfxswt.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/jsse.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/management-agent.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/plugin.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/resources.jar:/shared/common/jdk1.8.0_x64-latest/jre/lib/rt.jar
+JavaSE-1.8=/opt/tools/java/oracle/jdk-8/latest/jre/lib/charsets.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/deploy.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/javaws.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jce.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jfr.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jfxswt.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/jsse.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/management-agent.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/plugin.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/resources.jar:/opt/tools/java/oracle/jdk-8/latest/jre/lib/rt.jar
-JavaSE-1.7=/shared/common/oracle-jre1.7.0/lib/rt.jar:/shared/common/oracle-jre1.7.0/lib/charsets.jar:/shared/common/oracle-jre1.7.0/lib/deploy.jar:/shared/common/oracle-jre1.7.0/lib/management-agent.jar:/shared/common/oracle-jre1.7.0/lib/alt-rt.jar:/shared/common/oracle-jre1.7.0/lib/plugin.jar:/shared/common/oracle-jre1.7.0/lib/security/US_export_policy.jar:/shared/common/oracle-jre1.7.0/lib/security/local_policy.jar:/shared/common/oracle-jre1.7.0/lib/resources.jar:/shared/common/oracle-jre1.7.0/lib/jsse.jar:/shared/common/oracle-jre1.7.0/lib/jce.jar:/shared/common/oracle-jre1.7.0/lib/javaws.jar
+JavaSE-1.7=/opt/tools/java/oracle/jdk-7/latest/jre/lib/charsets.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/deploy.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/javaws.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/jce.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/jfr.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/jfxswt.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/jsse.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/management-agent.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/plugin.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/resources.jar:/opt/tools/java/oracle/jdk-7/latest/jre/lib/rt.jar
JavaSE-1.6=/opt/public/common/ibm-java-x86_64-60/jre/lib/amd64/default/jclSC160/vm.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/annotation.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/beans.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/java.util.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/jndi.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/logging.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/security.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/sql.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmorb.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmorbapi.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/rt.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/charsets.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/resources.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmpkcs.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcertpathfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjgssfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjssefw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmsaslfw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjcefw.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjgssprovider.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmjsseprovider2.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmcertpathprovider.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/ibmxmlcrypto.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/management-agent.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/xml.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/jlm.jar:/opt/public/common/ibm-java-x86_64-60/jre/lib/javascript.jar
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 00c57a3..beb20d1 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -285,10 +285,10 @@
<!-- Make org.eclipse.test.performance available while compiling test projects: -->
<echo message="Pre-installing Eclipse Test Framework into base Eclipse..."/>
<mkdir dir="${testsUpdatesDirBase}/eclipse"/>
- <tempfile property="eclispe.tests.tmp" prefix="eclipse.test"/>
- <get src="${eclipse.tests.zip}" dest="${eclipse.test.tmp"/>
+ <tempfile property="eclipse.tests.tmp" prefix="eclipse.tests"/>
+ <get src="${eclipse.tests.zip}" dest="${eclipse.tests.tmp}"/>
<unzip dest="${testsUpdatesDirBase}/eclipse" src="${eclipse.tests.tmp}"/>
- <delete><filename name="${eclipse.test.tmp}"/></delete>
+ <delete><filename name="${eclipse.tests.tmp}"/></delete>
<ant antfile="${OTScriptDir}/p2helper.xml" target="installFeature" dir="${baseLocation}">
<property name="feature" value="org.eclipse.test.feature.group"/>
<property name="sourceUpdatesDir" value="${testsUpdatesDirBase}/eclipse"/>