summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-06-08 16:50:19 -0400
committerStephan Herrmann2018-06-08 16:50:19 -0400
commitb99a8e323f1ee0e88f10697d2d60478488170deb (patch)
tree80b966ec6ef303930e8643d79900574e79dfabbb
parentae580b9f8b0d14f1b5e7f1da589c0bd24ac7ed1f (diff)
downloadorg.eclipse.objectteams-b99a8e323f1ee0e88f10697d2d60478488170deb.zip
org.eclipse.objectteams-b99a8e323f1ee0e88f10697d2d60478488170deb.tar.gz
org.eclipse.objectteams-b99a8e323f1ee0e88f10697d2d60478488170deb.tar.xz
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
-rw-r--r--releng/build-scripts/build/run.xml44
1 files changed, 2 insertions, 42 deletions
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index 2aab6fd..5d1b9c8 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -64,8 +64,7 @@ path to map file (with substitutions):
<property name="test.eclipseDir" value="${test.root.dir}/eclipse" />
<!-- directories for update sites: -->
- <property name="compilerUpdatesDir" value="${user.dir}/updateSiteCompiler"/>
- <!-- TODO: extract to prerequisistes? -->
+ <!-- TODO: extract compilerUpdatesDir to prerequisistes? -->
<property name="compilerUpdatesDir" value="http://download.eclipse.org/objectteams/updates/ot2.7/compiler"/>
<property name="otdtUpdatesDir" value="${user.dir}/updateSite"/>
<property name="testsUpdatesDirBase" value="${user.dir}/updateSiteTests"/>
@@ -223,46 +222,7 @@ path to map file (with substitutions):
<!-- setting an empty inputstring is a workaround for http://issues.apache.org/bugzilla/show_bug.cgi?id=34461 -->
<target name="createOTCompilerEclipse" depends="setupForCompile" description="create the bootstrapping Eclipse with OT/J compiler">
<echo message="Invoke pdebuild for creating the OT-Compiler"/>
-<!-- don't build it ...
- <java
- inputstring=""
- dir="${baseLocation}"
- fork="true"
- classname="org.eclipse.equinox.launcher.Main"
- classpath="${baseLocation}/plugins/${org.eclipse.equinox.launcher_jar}">
- <arg value="-Dosgi.ws=${ws}"/>
- <arg value="-Dosgi.os=${os}"/>
- <arg value="-Dosgi.arch=${arch}"/>
- <arg value="-application"/>
- <arg value="org.eclipse.ant.core.antRunner"/>
- <arg value="-buildfile"/>
- <arg value="${buildfile}"/>
- <arg value="-Dbuild.root.dir=${build.root.dir}"/>
- <arg value="-DbaseLocation=${baseLocation}"/>
- <arg value="-DOTScriptDir=${OTScriptDir}"/>
- <arg value="-Drun.eclipseScriptDir=${run.eclipseScriptDir}"/>
- <arg value="-Dbuilder=${builder-otcompiler}"/>
- <arg value="-D${installmode}=true"/> <! - - <- obsolete? - - >
- <arg value="-Dcomponent.short=OT-Compiler"/>
- <arg value="-DotdtUpdatesDir=${compilerUpdatesDir}"/>
- <arg value="-Dconfigs=*,*,*"/>
- <arg value="-Dbaseos=${os}"/>
- <arg value="-Dbasews=${ws}"/>
- <arg value="-Dbasearch=${arch}"/>
- <arg value="-Dtest.root.dir=${test.root.dir}"/>
- <arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
- <arg value="-DmapVersionTag=${mapVersionTag}"/>
- <arg value="-Dmap.file.path=${map.file.path}"/>
- <arg value="-DfetchCacheLocation=${fetchCacheLocation}"/>
- <arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
- <arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
- <arg value="-Djdt.compiler.apt=${jdt.compiler.apt}"/>
- <arg value="-Djdt.compiler.tool=${jdt.compiler.tool}"/>
- < ! - -arg value="-verbose" / - ->
- <jvmarg value="${vm.args}"/>
- </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: -->
+<!-- Re-use the compiler from the previous published build: -->
<ant antfile="${OTScriptDir}/p2helper.xml" target="installFeatureFromUrl" dir="${baseLocation}">
<property name="feature" value="org.eclipse.objectteams.otdt.core.patch.feature.group"/>
<property name="sourceUpdatesUrl" value="${compilerUpdatesDir}"/>