Releng: sync 'extractVersions' with script on JIRO & some clean-up
diff --git a/releng/build-scripts/bin/extractVersions b/releng/build-scripts/bin/extractVersions
index e5f9794..647a34a 100755
--- a/releng/build-scripts/bin/extractVersions
+++ b/releng/build-scripts/bin/extractVersions
@@ -1,16 +1,26 @@
#!/bin/sh
-if [ ! -d $1 ]
+if [ $# != 2 ]
then
- echo "Not a directory: $1"
- exit 1
+ echo "Usage: ${0} dropsDir sdkVersion
fi
-SDK=`ls $1/eclipse-SDK*linux-gtk-x86_64.tar.gz`
+dropsDir=$1
+sdkVersion=$2
+
+# below: verbatim copy of Job-script on Jenkins:
+
+#!/bin/bash
+
+
+SDK=eclipse-SDK-${sdkVersion}-linux-gtk-x86_64.tar.gz
+wget -nv https://download.eclipse.org/eclipse/downloads/drops4/${dropDir}/${SDK}
+
+
if [ ! -r $SDK ]
then
- echo "Can't read SDK from $SDK"
- exit 1
+ echo "Can't read SDK from $SDK"
+ exit 1
fi
PDEBUILD=eclipse/plugins/org.eclipse.pde.build_.*/about.html
@@ -20,6 +30,7 @@
JDT_COMPILER_TOOL=eclipse/plugins/org.eclipse.jdt.compiler.tool_
for VERSION in `tar tzvf $SDK | egrep "${PDEBUILD}|${LAUNCHER}|${JDTFEATURE}|${JDT_COMPILER_APT}|${JDT_COMPILER_TOOL}" | sed -e "s#.*eclipse/[^/]*/\([^/]*\).*#\1#"`
+
do
case $VERSION in
org.eclipse.pde.build*)
@@ -43,6 +54,12 @@
;;
esac
done
+echo
+echo "Variables for otdt_prerequisites_hipp.sh:"
+echo "========================================="
+echo "EVERSION=\${EVERSION:=\"${sdkVersion}\"}"
+echo "DROP=\${DROPS4}/\${DROP:=\"${dropDir}\"}"
+echo
echo "Versions for run.properties:"
echo "============================"
@@ -57,7 +74,6 @@
echo "# jdt.core fragments for extracting pre-built classes and properties:"
echo "jdt.compiler.apt=${JDT_COMPILER_APT_VERSION}"
echo "jdt.compiler.tool=${JDT_COMPILER_TOOL_VERSION}"
-echo "============================"
echo
echo "Version for org.eclipse.objectteams.otdt.core.patch.feature:"
diff --git a/releng/build-scripts/build/OT-Compiler/build.properties b/releng/build-scripts/build/OT-Compiler/build.properties
index bf431c9..51d6df6 100644
--- a/releng/build-scripts/build/OT-Compiler/build.properties
+++ b/releng/build-scripts/build/OT-Compiler/build.properties
@@ -9,21 +9,15 @@
# because zip wouldn't find any files to include into the target zip otherwise
archivePrefix=.
-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-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-14=/opt/tools/java/openjdk/jdk-14/latest/lib/jrt-fs.jar
+JavaSE-13=/opt/tools/java/openjdk/jdk-13/latest/lib/jrt-fs.jar
+JavaSE-12=/opt/tools/java/openjdk/jdk-12/latest/lib/jrt-fs.jar
+JavaSE-11=/opt/tools/java/openjdk/jdk-11/latest/lib/jrt-fs.jar
+JavaSE-10=/opt/tools/java/openjdk/jdk-10/latest/lib/jrt-fs.jar
+JavaSE-9=/opt/tools/java/openjdk/jdk-9/latest/lib/jrt-fs.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.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
-
-J2SE-1.5=/shared/common/jdk-1.5.0-22.x86_64/jre/lib/charsets.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/jce.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/jsse.jar:/shared/common/jdk-1.5.0-22.x86_64/jre/lib/rt.jar
-
-J2SE-1.4=/shared/common/j2sdk1.4.2_19/jre/lib/rt.jar
-
skipBase=true
base=${build.root.dir}
diff --git a/releng/build-scripts/build/OTDT-Build/build.properties b/releng/build-scripts/build/OTDT-Build/build.properties
index 24293df..b35247c 100644
--- a/releng/build-scripts/build/OTDT-Build/build.properties
+++ b/releng/build-scripts/build/OTDT-Build/build.properties
@@ -18,10 +18,12 @@
# but we don't specify arch so the build can be run on all architectures
configs=linux,gtk,*
-JavaSE-12=/shared/common/java/openjdk/jdk-12_x64-latest/lib/jrt-fs.jar
+JavaSE-14=/opt/tools/java/openjdk/jdk-14/latest/lib/jrt-fs.jar
+JavaSE-13=/opt/tools/java/openjdk/jdk-13/latest/lib/jrt-fs.jar
+JavaSE-12=/opt/tools/java/openjdk/jdk-12/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-10=/opt/tools/java/openjdk/jdk-10/latest/lib/jrt-fs.jar
+JavaSE-9=/opt/tools/java/openjdk/jdk-9/latest/lib/jrt-fs.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
@@ -31,9 +33,6 @@
J2SE-1.5=/opt/tools/java/oracle/jdk-5/latest/jre/lib/charsets.jar:/opt/tools/java/oracle/jdk-5/latest/jre/lib/jce.jar:/opt/tools/java/oracle/jdk-5/latest/jre/lib/jsse.jar:/opt/tools/java/oracle/jdk-5/latest/jre/lib/rt.jar
-J2SE-1.4=/shared/common/j2sdk1.4.2_19/jre/lib/rt.jar
-
-
skipBase=true
base=${build.root.dir}
# baseLocation is set from run.xml
