Fedora Eclipse now compiles all JSR14 upstream bundles with a target of 1.5, allowing us to leave in place parts of Tycho code that use those particular libraries with generics.
156 lines
7.5 KiB
Diff
156 lines
7.5 KiB
Diff
From 19866503693224e992e2c3caa0b0c978bfe9aee5 Mon Sep 17 00:00:00 2001
|
|
From: Roland Grunberg <rgrunber@redhat.com>
|
|
Date: Tue, 12 Jun 2012 09:56:38 -0400
|
|
Subject: [PATCH] Fix the Tycho build to work on Fedora.
|
|
|
|
Minor fixes of limited scope needed to have Tycho building on Fedora.
|
|
|
|
Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
|
|
|
|
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
|
|
---
|
|
pom.xml | 5 -----
|
|
tycho-artifactcomparator/pom.xml | 4 ++--
|
|
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
|
|
tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
|
|
.../tycho-standalone-p2-director/p2 Director.product | 1 -
|
|
tycho-compiler-jdt/pom.xml | 4 ----
|
|
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
|
|
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
|
|
8 files changed, 15 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index dc7c1f5..1868f9a 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
|
|
<version>${jdtVersion}</version>
|
|
</dependency>
|
|
<dependency>
|
|
- <groupId>org.eclipse.tycho</groupId>
|
|
- <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
|
|
- <version>${jdtAptVersion}</version>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.apache.maven.surefire</groupId>
|
|
<artifactId>surefire-booter</artifactId>
|
|
<version>2.10</version>
|
|
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
|
|
index 775107a..11bcb70 100644
|
|
--- a/tycho-artifactcomparator/pom.xml
|
|
+++ b/tycho-artifactcomparator/pom.xml
|
|
@@ -24,7 +24,7 @@
|
|
<dependency>
|
|
<!-- CQ https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6591 -->
|
|
<groupId>org.ow2.asm</groupId>
|
|
- <artifactId>asm-debug-all</artifactId>
|
|
+ <artifactId>asm-all</artifactId>
|
|
<version>4.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
@@ -54,4 +54,4 @@
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
-</project>
|
|
\ No newline at end of file
|
|
+</project>
|
|
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
|
index 3e584f5..8b54310 100644
|
|
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
|
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
|
@@ -41,7 +41,6 @@
|
|
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
|
|
<plugin id="org.eclipse.equinox.app"/>
|
|
<plugin id="org.eclipse.equinox.common"/>
|
|
- <plugin id="org.eclipse.equinox.concurrent"/>
|
|
<plugin id="org.eclipse.equinox.ds"/>
|
|
<plugin id="org.eclipse.equinox.frameworkadmin"/>
|
|
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
|
|
diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
|
|
index d23b885..1437dbd 100644
|
|
--- a/tycho-bundles/tycho-bundles-target/tycho.target
|
|
+++ b/tycho-bundles/tycho-bundles-target/tycho.target
|
|
@@ -4,10 +4,6 @@
|
|
<target name="Target platform for Tycho's bundles" sequenceNumber="7">
|
|
<locations>
|
|
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
|
|
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/>
|
|
-<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/>
|
|
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/>
|
|
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/>
|
|
<repository location="http://download.eclipse.org/eclipse/updates/4.2"/>
|
|
</location>
|
|
</locations>
|
|
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
|
index dd80b5e..797b4ba 100644
|
|
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
|
+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
|
@@ -41,7 +41,6 @@
|
|
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
|
|
<plugin id="org.eclipse.equinox.app"/>
|
|
<plugin id="org.eclipse.equinox.common"/>
|
|
- <plugin id="org.eclipse.equinox.concurrent"/>
|
|
<plugin id="org.eclipse.equinox.ds"/>
|
|
<plugin id="org.eclipse.equinox.frameworkadmin"/>
|
|
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
|
|
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
|
|
index 01b9a9e..c373e6a 100644
|
|
--- a/tycho-compiler-jdt/pom.xml
|
|
+++ b/tycho-compiler-jdt/pom.xml
|
|
@@ -38,10 +38,6 @@
|
|
<artifactId>org.eclipse.jdt.core</artifactId>
|
|
</dependency>
|
|
<dependency>
|
|
- <groupId>org.eclipse.tycho</groupId>
|
|
- <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
|
|
- </dependency>
|
|
- <dependency>
|
|
<groupId>org.codehaus.plexus</groupId>
|
|
<artifactId>plexus-compiler-api</artifactId>
|
|
</dependency>
|
|
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
|
|
index 5c4dcb3..9830aee 100644
|
|
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
|
|
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
|
|
@@ -97,12 +97,11 @@ public abstract class AbstractTychoIntegrationTest {
|
|
verifier.getCliOptions().add(customOptions);
|
|
}
|
|
|
|
- if (System.getProperty(SYSPROP_STATELOCATION) != null) {
|
|
- verifier.setForkJvm(false);
|
|
- String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
|
|
- if (m2eresolver != null) {
|
|
- verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
|
|
- }
|
|
+ String m2eState = System.getProperty("m2eclipse.workspace.state");
|
|
+ String m2eResolver = System.getProperty("m2eclipse.workspace.resolver");
|
|
+
|
|
+ if (m2eState != null && m2eResolver != null) {
|
|
+ verifier.getVerifierProperties().put("m2eclipse.workspace.state", m2eState);
|
|
}
|
|
|
|
return verifier;
|
|
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
|
index a9d80d3..3ddbe9c 100644
|
|
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
|
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
|
@@ -37,6 +37,14 @@ public class EmptyLifecycleExecutor implements LifecycleExecutor {
|
|
return null;
|
|
}
|
|
|
|
+ public MavenExecutionPlan calculateExecutionPlan(MavenSession session, boolean bool, String... tasks)
|
|
+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
|
|
+ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
|
|
+ PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
|
|
+ PluginVersionResolutionException {
|
|
+ return null;
|
|
+ }
|
|
+
|
|
public MavenExecutionPlan calculateExecutionPlan(MavenSession session, String... tasks)
|
|
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
|
|
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
|
|
--
|
|
1.7.11.4
|
|
|