Bug 535509 - Conflicting non-Eclipse org.eclipse.jdt.core in Photon
release repo
- try to workaround error of selecting the wrong version of jdt.core
diff --git a/releng/build-scripts/build/p2helper.xml b/releng/build-scripts/build/p2helper.xml
index 31cda67..28ebef5 100644
--- a/releng/build-scripts/build/p2helper.xml
+++ b/releng/build-scripts/build/p2helper.xml
@@ -49,6 +49,27 @@
</java>
</target>
+ <target name="installFeatureFromUrl">
+ <echo message="Installing ${feature} from ${sourceUpdatesUrl} to ${targetEclipseDir}"/>
+ <java
+ inputstring=""
+ dir="${targetEclipseDir}"
+ fork="true"
+ classname="org.eclipse.equinox.launcher.Main"
+ classpath="${targetEclipseDir}/plugins/${org.eclipse.equinox.launcher_jar}">
+ <jvmarg value="-Declipse.p2.MD5Check=false" />
+ <arg value="-consoleLog"/>
+ <arg value="-application"/>
+ <arg value="org.eclipse.equinox.p2.director"/>
+ <arg value="-metadataRepository" />
+ <arg value="${sourceUpdatesUrl}" />
+ <arg value="-artifactRepository" />
+ <arg value="${sourceUpdatesUrl}" />
+ <arg value="-installIU" />
+ <arg value="${feature}" />
+ </java>
+ </target>
+
<target name="installOTDT">
<echo message="Installing the OTDT from ${otdtUpdatesDir} into ${test.eclipseDir}"/>
<antcall target="installFeature">
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 05f7e0c..f3417bb 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -65,7 +65,7 @@
<!-- directories for update sites: -->
<property name="compilerUpdatesDir" value="${user.dir}/updateSiteCompiler"/>
- <property name="previousPublishedUpdatesDir" value="${user.dir}/updateSiteSigned"/>
+ <property name="previousPublishedUpdatesDir" value="http://download.eclipse.org/objectteams/updates/ot2.7/201806051508"/>
<property name="otdtUpdatesDir" value="${user.dir}/updateSite"/>
<property name="testsUpdatesDirBase" value="${user.dir}/updateSiteTests"/>
<!-- will have sub directories "eclipse" and "otdt" -->
@@ -262,9 +262,9 @@
</java>
.. by try to re-use the compiler from the previous published build: -->
<!-- Now we should have an update site with the patch feature, time to install it into base: -->
- <ant antfile="${OTScriptDir}/p2helper.xml" target="installFeature" dir="${baseLocation}">
+ <ant antfile="${OTScriptDir}/p2helper.xml" target="installFeatureFromUrl" dir="${baseLocation}">
<property name="feature" value="org.eclipse.objectteams.otdt.core.patch.feature.group"/>
- <property name="sourceUpdatesDir" value="${previousPublishedUpdatesDir}"/>
+ <property name="sourceUpdatesUrl" value="${previousPublishedUpdatesDir}"/>
<property name="targetEclipseDir" value="${baseLocation}"/>
</ant>
</target>
