Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlvaro Sanchez-Leon2014-11-05 19:23:41 +0000
committerAlvaro Sanchez-Leon2014-11-10 13:03:03 +0000
commit5e9f4f0d1f8a51ddb195244503856d28341d3915 (patch)
tree87b3e13adb4db54f30ab1d0b3626e5c59ac7e4fd
parentaf395d867660ccd39b749dc6605a2ab96e46a325 (diff)
downloadorg.eclipse.cdt-5e9f4f0d1f8a51ddb195244503856d28341d3915.tar.gz
org.eclipse.cdt-5e9f4f0d1f8a51ddb195244503856d28341d3915.tar.xz
org.eclipse.cdt-5e9f4f0d1f8a51ddb195244503856d28341d3915.zip
Bug 450192 - configurable maven builds to skip ppc64le
Change-Id: Ib811afd6b1d7efc293d6ca5b1c2ef7f6328deb21 Reviewed-on: https://git.eclipse.org/r/35981 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
-rw-r--r--core/org.eclipse.cdt.core.linux/pom.xml51
-rw-r--r--pom.xml85
2 files changed, 124 insertions, 12 deletions
diff --git a/core/org.eclipse.cdt.core.linux/pom.xml b/core/org.eclipse.cdt.core.linux/pom.xml
index 97407b7dd4a..89dbbba561f 100644
--- a/core/org.eclipse.cdt.core.linux/pom.xml
+++ b/core/org.eclipse.cdt.core.linux/pom.xml
@@ -15,6 +15,52 @@
<artifactId>org.eclipse.cdt.core.linux</artifactId>
<packaging>eclipse-plugin</packaging>
+ <profiles>
+ <profile>
+ <id>ppc64le</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc64le</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
@@ -45,11 +91,6 @@
<ws>gtk</ws>
<arch>ppc64</arch>
</environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>ppc64le</arch>
- </environment>
</environments>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index 437f786f90c..15b8c22fa8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,6 @@
<module>core/org.eclipse.cdt.core.linux.x86</module>
<module>core/org.eclipse.cdt.core.linux.x86_64</module>
<module>core/org.eclipse.cdt.core.linux.ppc64</module>
- <module>core/org.eclipse.cdt.core.linux.ppc64le</module>
<module>core/org.eclipse.cdt.core.win32</module>
<module>core/org.eclipse.cdt.core.win32.x86</module>
<module>core/org.eclipse.cdt.core.win32.x86_64</module>
@@ -343,8 +342,85 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>ppc64le</id>
+ <activation>
+ <property>
+ <name>!skip-ppc64le</name>
+ </property>
+ </activation>
+ <modules>
+ <module>core/org.eclipse.cdt.core.linux.ppc64le</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <pomDependencies>consider</pomDependencies>
+ <!-- We need to add all supported environments here as tycho does not currently -->
+ <!-- append the environments but replaces them with this definition -->
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>aix</os>
+ <ws>gtk</ws>
+ <arch>ppc</arch>
+ </environment>
+ <environment>
+ <os>solaris</os>
+ <ws>gtk</ws>
+ <arch>sparc</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc64le</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
<build>
<plugins>
<plugin>
@@ -376,11 +452,6 @@
<ws>gtk</ws>
<arch>ppc64</arch>
</environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>ppc64le</arch>
- </environment>
<environment>
<os>win32</os>
<ws>win32</ws>

Back to the top