aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2012-09-10 14:26:41 (EDT)
committerSilenio Quarti2012-09-12 12:23:59 (EDT)
commit903c10c53abaaba7c5d067d0c60e444ec7361b0f (patch)
tree0cd4c96941703fdb8dfe7b55040cbdb3cc934293
parentc99d05ef6ae412be4ebb9fe2b9f8f43561857549 (diff)
downloadeclipse.platform.swt-903c10c53abaaba7c5d067d0c60e444ec7361b0f.zip
eclipse.platform.swt-903c10c53abaaba7c5d067d0c60e444ec7361b0f.tar.gz
eclipse.platform.swt-903c10c53abaaba7c5d067d0c60e444ec7361b0f.tar.bz2
Bug 381192 Tycho support
-rw-r--r--bundles/org.eclipse.swt/pom.xml19
-rw-r--r--examples/org.eclipse.swt.examples.ole.win32/pom.xml24
-rw-r--r--pom.xml2
3 files changed, 41 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml
index 1562cd8..e9d6374 100644
--- a/bundles/org.eclipse.swt/pom.xml
+++ b/bundles/org.eclipse.swt/pom.xml
@@ -8,10 +8,12 @@
Contributors:
Igor Fedorenko - initial implementation
+ Krzysztof Daniel, Red Hat, Inc. - building native SWT parts.
-->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform.swt</artifactId>
@@ -23,4 +25,17 @@
<artifactId>org.eclipse.swt</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <configuration>
+ <dependency-resolution>
+ <optionalDependencies>ignore</optionalDependencies>
+ </dependency-resolution>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
index dc8cedc..529468e 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/pom.xml
+++ b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
@@ -23,4 +23,28 @@
<artifactId>org.eclipse.swt.examples.ole.win32</artifactId>
<version>3.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/pom.xml b/pom.xml
index 2b60cc5..c89cf16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
<packaging>pom</packaging>
<modules>
-<!--
<module>bundles/org.eclipse.swt</module>
<module>bundles/org.eclipse.swt.opengl</module>
<module>bundles/org.eclipse.swt.tools</module>
@@ -40,7 +39,6 @@
<module>examples/org.eclipse.swt.examples.layouts</module>
<module>examples/org.eclipse.swt.examples.ole.win32</module>
<module>examples/org.eclipse.swt.examples.paint</module>
- -->
<module>tests/org.eclipse.swt.tests</module>
</modules>
</project>