Releng: use previous SDK for installing the previous compiler into
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index cc0b37c..7742dc3 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -51,13 +51,22 @@
# EXPORT: Nice-level for the Ant process:
NICE="10"
-# VERSIONS:
-# Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=${SDK_QUALIFIER:="I20190411-0625"}
-
# Architecture (as used by OSGi):
ARCH=`arch`
+# VERSIONS:
+# -- Boot:
+# used only locally (components of the ECLIPSE_BOOT_TGZ path):
+EVERSION="4.11"
+DROP="R-4.11-201903070500"
+
+# EXPORT: archive file of the boot eclipse SDK build:
+ECLIPSE_BOOT_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
+
+# -- Base for testing: --
+# Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20190411-0625"}
+
# used only locally (components of the ECLIPSE_SDK_TGZ path):
EVERSION=${EVERSION:="4.12M1"}
DROP=${DROPS4}/${DROP:="S-4.12M1-201904110625"}
diff --git a/releng/build-scripts/build/otdt_runtests-hipp.sh b/releng/build-scripts/build/otdt_runtests-hipp.sh
index 8cf4760..1751103 100755
--- a/releng/build-scripts/build/otdt_runtests-hipp.sh
+++ b/releng/build-scripts/build/otdt_runtests-hipp.sh
@@ -122,6 +122,7 @@
# Assemble the Ant call:
ANT_OPTIONS="${ANT_PROFILE} \
+ -Declipse-boot.tgz=${ECLIPSE_BOOT_TGZ} \
-Declipse-app.tgz=${ECLIPSE_SDK_TGZ} \
-Declipse.tests.zip=${ECLIPSE_TESTLIB_ZIP} \
-Declipse.sdk.qualifier=${SDK_QUALIFIER} \
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 480f2a2..42962c8 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -15,7 +15,9 @@
description="Show values of all properties that should be passed from our caller.">
<echo>Properties passed into this script:
------------------------------------------------------------------------------
-path of eclipse SDK:
+path of boot eclipse SDK:
+ eclipse-boot.tgz = ${eclipse-boot.tgz}
+path of base eclipse SDK:
eclipse-app.tgz = ${eclipse-app.tgz}
eclipse SDK build qualifier:
eclipse.sdk.qualifier = ${eclipse.sdk.qualifier}
@@ -212,9 +214,9 @@
</target>
<target name="UnzipEclipse">
- <echo message="Extracting Eclipse (${eclipse-app.tgz}) in ${build.root.dir}..."/>
+ <echo message="Extracting Boot Eclipse (${eclipse-boot.tgz}) in ${build.root.dir}..."/>
<mkdir dir="${build.root.dir}"/>
- <untar compression="gzip" src="${eclipse-app.tgz}" dest="${build.root.dir}"/>
+ <untar compression="gzip" src="${eclipse-boot.tgz}" dest="${build.root.dir}"/>
</target>
<target name="AddPluginsToEclipse" description="Add git.pde.build plugins to the base Eclipse">
