Releng: still better decoupling of boot/base location:
- let p2helper use director from base location
diff --git a/releng/build-scripts/build/p2helper.xml b/releng/build-scripts/build/p2helper.xml
index 28ebef5..8910382 100644
--- a/releng/build-scripts/build/p2helper.xml
+++ b/releng/build-scripts/build/p2helper.xml
@@ -35,7 +35,7 @@
dir="${targetEclipseDir}"
fork="true"
classname="org.eclipse.equinox.launcher.Main"
- classpath="${targetEclipseDir}/plugins/${org.eclipse.equinox.launcher_jar}">
+ classpath="${directorLocation}/plugins/${org.eclipse.equinox.launcher_jar}">
<jvmarg value="-Declipse.p2.MD5Check=false" />
<arg value="-consoleLog"/>
<arg value="-application"/>
@@ -56,7 +56,7 @@
dir="${targetEclipseDir}"
fork="true"
classname="org.eclipse.equinox.launcher.Main"
- classpath="${targetEclipseDir}/plugins/${org.eclipse.equinox.launcher_jar}">
+ classpath="${directorLocation}/plugins/${org.eclipse.equinox.launcher_jar}">
<jvmarg value="-Declipse.p2.MD5Check=false" />
<arg value="-consoleLog"/>
<arg value="-application"/>
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 5e1274e..bca6d0a 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -235,6 +235,7 @@
<echo message="Invoke pdebuild for creating the OT-Compiler"/>
<!-- Re-use the compiler from the previous published build: -->
<ant antfile="${OTScriptDir}/p2helper.xml" target="installFeatureFromUrl" dir="${bootLocation}">
+ <property name="directorLocation" value="${baseLocation}"/>
<property name="feature" value="org.eclipse.objectteams.otdt.core.patch.feature.group"/>
<property name="sourceUpdatesUrl" value="${compilerUpdatesDir}"/>
<property name="targetEclipseDir" value="${bootLocation}"/>
@@ -254,6 +255,7 @@
<mkdir dir="${testsUpdatesDirBase}/eclipse"/>
<unzip dest="${testsUpdatesDirBase}/eclipse" src="${eclipse.tests.zip}"/>
<ant antfile="${OTScriptDir}/p2helper.xml" target="installFeature" dir="${baseLocation}">
+ <property name="directorLocation" value="${baseLocation}"/>
<property name="feature" value="org.eclipse.test.feature.group"/>
<property name="sourceUpdatesDir" value="${testsUpdatesDirBase}/eclipse"/>
<property name="targetEclipseDir" value="${baseLocation}"/>
@@ -328,8 +330,10 @@
</java>
<!-- At this point a local update site exists, thanks to p2gathering=true -->
- <ant antfile="${OTScriptDir}/p2helper.xml" target="patchMetadata" dir="${otdtUpdatesDir}"/>
-
+ <ant antfile="${OTScriptDir}/p2helper.xml" target="patchMetadata" dir="${otdtUpdatesDir}">
+ <property name="directorLocation" value="${baseLocation}"/>
+ </ant>
+
<property name="_hasCreatedOTDTEclipse" value="true" />
</target>
diff --git a/releng/build-scripts/build/test.xml b/releng/build-scripts/build/test.xml
index 64b3c2b..0fb8551 100644
--- a/releng/build-scripts/build/test.xml
+++ b/releng/build-scripts/build/test.xml
@@ -37,8 +37,10 @@
<echo message="### Build Test Eclipse ###"/>
<echo message="Installing OTDT..."/>
- <ant antfile="${OTScriptDir}/p2helper.xml" target="installOTDT" dir="${test.eclipseDir}"/>
-
+ <ant antfile="${OTScriptDir}/p2helper.xml" target="installOTDT" dir="${test.eclipseDir}">
+ <property name="directorLocation" value="${baseLocation}"/>
+ </ant>
+
<property name="otdt-eclipse.is.setup" value="true"/>
</target>
@@ -47,7 +49,9 @@
>
<echo message="Setting up tests in ${test.eclipseDir}"/>
<!-- do install using p2: -->
- <ant antfile="${OTScriptDir}/p2helper.xml" target="installTests" dir="${test.eclipseDir}"/>
+ <ant antfile="${OTScriptDir}/p2helper.xml" target="installTests" dir="${test.eclipseDir}">
+ <property name="directorLocation" value="${baseLocation}"/>
+ </ant>
<echo message="get library.xml"/>
<get src="http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml"