diff options
16 files changed, 297 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt.fragments.localbuild/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.fragments.localbuild/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..8fa1046d13 --- /dev/null +++ b/bundles/org.eclipse.swt.fragments.localbuild/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.fragments.localbuild +Bundle-Version: 3.104.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: plugin diff --git a/bundles/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf b/bundles/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf new file mode 100644 index 0000000000..5d05b7e7fd --- /dev/null +++ b/bundles/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf @@ -0,0 +1,75 @@ +# pull in the applicable implementation fragment at build time (bug 461427) +requires.3.namespace = org.eclipse.equinox.p2.iu +requires.3.name = org.eclipse.swt.win32.win32.x86 +requires.3.range = 0.0.0 +requires.3.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)) + +requires.4.namespace = org.eclipse.equinox.p2.iu +requires.4.name = org.eclipse.swt.win32.win32.x86_64 +requires.4.range = 0.0.0 +requires.4.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)) + +requires.5.namespace = org.eclipse.equinox.p2.iu +requires.5.name = org.eclipse.swt.gtk.linux.x86 +requires.5.range = 0.0.0 +requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)) + +requires.6.namespace = org.eclipse.equinox.p2.iu +requires.6.name = org.eclipse.swt.gtk.linux.s390x +requires.6.range = 0.0.0 +requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)) + +requires.7.namespace = org.eclipse.equinox.p2.iu +requires.7.name = org.eclipse.swt.gtk.linux.s390 +requires.7.range = 0.0.0 +requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390)) + +requires.8.namespace = org.eclipse.equinox.p2.iu +requires.8.name = org.eclipse.swt.gtk.solaris.sparc +requires.8.range = 0.0.0 +requires.8.filter = (&(osgi.os=solaris)(osgi.ws=gtk)(osgi.arch=sparc)) + +requires.9.namespace = org.eclipse.equinox.p2.iu +requires.9.name = org.eclipse.swt.gtk.solaris.x86 +requires.9.range = 0.0.0 +requires.9.filter = (&(osgi.os=solaris)(osgi.ws=gtk)(osgi.arch=x86)) + +requires.10.namespace = org.eclipse.equinox.p2.iu +requires.10.name = org.eclipse.swt.gtk.linux.ppc +requires.10.range = 0.0.0 +requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc)) + +requires.11.namespace = org.eclipse.equinox.p2.iu +requires.11.name = org.eclipse.swt.gtk.linux.ppc64 +requires.11.range = 0.0.0 +requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)) + +requires.12.namespace = org.eclipse.equinox.p2.iu +requires.12.name = org.eclipse.swt.gtk.linux.x86_64 +requires.12.range = 0.0.0 +requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)) + +requires.13.namespace = org.eclipse.equinox.p2.iu +requires.13.name = org.eclipse.swt.gtk.linux.ppcle64 +requires.13.range = 0.0.0 +requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppcle64)) + +requires.14.namespace = org.eclipse.equinox.p2.iu +requires.14.name = org.eclipse.swt.cocoa.macosx.x86_64 +requires.14.range = 0.0.0 +requires.14.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) + +requires.15.namespace = org.eclipse.equinox.p2.iu +requires.15.name = org.eclipse.swt.gtk.aix.ppc +requires.15.range = 0.0.0 +requires.15.filter = (&(osgi.os=aix)(osgi.ws=gtk)(osgi.arch=ppc)) + +requires.16.namespace = org.eclipse.equinox.p2.iu +requires.16.name = org.eclipse.swt.gtk.aix.ppc64 +requires.16.range = 0.0.0 +requires.16.filter = (&(osgi.os=aix)(osgi.ws=gtk)(osgi.arch=ppc64)) + +requires.17.namespace = org.eclipse.equinox.p2.iu +requires.17.name = org.eclipse.swt.gtk.hpux.ia64 +requires.17.range = 0.0.0 +requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)) diff --git a/bundles/org.eclipse.swt.fragments.localbuild/plugin.properties b/bundles/org.eclipse.swt.fragments.localbuild/plugin.properties new file mode 100644 index 0000000000..4d3b8455a5 --- /dev/null +++ b/bundles/org.eclipse.swt.fragments.localbuild/plugin.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2015 SAP SE and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# SAP SE - initial API and implementation +############################################################################### +pluginName = SWT fragments for local builds +providerName = Eclipse.org diff --git a/bundles/org.eclipse.swt.fragments.localbuild/pom.xml b/bundles/org.eclipse.swt.fragments.localbuild/pom.xml new file mode 100644 index 0000000000..2c1f9133a9 --- /dev/null +++ b/bundles/org.eclipse.swt.fragments.localbuild/pom.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 SAP SE and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + SAP SE - initial API and implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>eclipse.platform.swt</artifactId> + <groupId>eclipse.platform.swt</groupId> + <version>4.5.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.swt</groupId> + <artifactId>org.eclipse.swt.fragments.localbuild</artifactId> + <version>3.104.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> diff --git a/bundles/org.eclipse.swt.tools/pom.xml b/bundles/org.eclipse.swt.tools/pom.xml index a751804d2e..60f8179f74 100644 --- a/bundles/org.eclipse.swt.tools/pom.xml +++ b/bundles/org.eclipse.swt.tools/pom.xml @@ -12,10 +12,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>eclipse.platform.swt</artifactId> + <artifactId>eclipse.platform.swt.localbuild</artifactId> <groupId>eclipse.platform.swt</groupId> <version>4.5.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../local-build/local-build-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.tools</artifactId> diff --git a/examples/org.eclipse.swt.examples.browser.demos/pom.xml b/examples/org.eclipse.swt.examples.browser.demos/pom.xml index f8bc37d5c7..bc359e2478 100644 --- a/examples/org.eclipse.swt.examples.browser.demos/pom.xml +++ b/examples/org.eclipse.swt.examples.browser.demos/pom.xml @@ -12,10 +12,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>eclipse.platform.swt</artifactId> + <artifactId>eclipse.platform.swt.localbuild</artifactId> <groupId>eclipse.platform.swt</groupId> <version>4.5.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../local-build/local-build-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.examples.browser.demos</artifactId> diff --git a/examples/org.eclipse.swt.examples.launcher/pom.xml b/examples/org.eclipse.swt.examples.launcher/pom.xml index 6d18ff4583..bd9de976db 100644 --- a/examples/org.eclipse.swt.examples.launcher/pom.xml +++ b/examples/org.eclipse.swt.examples.launcher/pom.xml @@ -12,10 +12,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>eclipse.platform.swt</artifactId> + <artifactId>eclipse.platform.swt.localbuild</artifactId> <groupId>eclipse.platform.swt</groupId> <version>4.5.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../local-build/local-build-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.examples.launcher</artifactId> diff --git a/examples/org.eclipse.swt.examples.views/pom.xml b/examples/org.eclipse.swt.examples.views/pom.xml index 0f117a3b38..1cc06facf2 100644 --- a/examples/org.eclipse.swt.examples.views/pom.xml +++ b/examples/org.eclipse.swt.examples.views/pom.xml @@ -12,10 +12,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>eclipse.platform.swt</artifactId> + <artifactId>eclipse.platform.swt.localbuild</artifactId> <groupId>eclipse.platform.swt</groupId> <version>4.5.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../local-build/local-build-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.examples.views</artifactId> diff --git a/examples/org.eclipse.swt.examples/pom.xml b/examples/org.eclipse.swt.examples/pom.xml index 4d8d87962c..1cb05d270a 100644 --- a/examples/org.eclipse.swt.examples/pom.xml +++ b/examples/org.eclipse.swt.examples/pom.xml @@ -12,10 +12,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>eclipse.platform.swt</artifactId> + <artifactId>eclipse.platform.swt.localbuild</artifactId> <groupId>eclipse.platform.swt</groupId> <version>4.5.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../local-build/local-build-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.examples</artifactId> diff --git a/local-build/local-build-parent/pom.xml b/local-build/local-build-parent/pom.xml new file mode 100644 index 0000000000..ed5da5cd5f --- /dev/null +++ b/local-build/local-build-parent/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Red Hat Inc. and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Alexander Kurtakov - initial implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>eclipse.platform.swt</artifactId> + <groupId>eclipse.platform.swt</groupId> + <version>4.5.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + <artifactId>eclipse.platform.swt.localbuild</artifactId> + <packaging>pom</packaging> + + <profiles> + <profile> + <id>build-individual-bundles</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <type>eclipse-plugin</type> + <id>org.eclipse.swt.fragments.localbuild</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> + diff --git a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/MANIFEST.MF b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..8fa1046d13 --- /dev/null +++ b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/MANIFEST.MF @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.fragments.localbuild +Bundle-Version: 3.104.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: plugin diff --git a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf new file mode 100644 index 0000000000..5d05b7e7fd --- /dev/null +++ b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf @@ -0,0 +1,75 @@ +# pull in the applicable implementation fragment at build time (bug 461427) +requires.3.namespace = org.eclipse.equinox.p2.iu +requires.3.name = org.eclipse.swt.win32.win32.x86 +requires.3.range = 0.0.0 +requires.3.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)) + +requires.4.namespace = org.eclipse.equinox.p2.iu +requires.4.name = org.eclipse.swt.win32.win32.x86_64 +requires.4.range = 0.0.0 +requires.4.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)) + +requires.5.namespace = org.eclipse.equinox.p2.iu +requires.5.name = org.eclipse.swt.gtk.linux.x86 +requires.5.range = 0.0.0 +requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)) + +requires.6.namespace = org.eclipse.equinox.p2.iu +requires.6.name = org.eclipse.swt.gtk.linux.s390x +requires.6.range = 0.0.0 +requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)) + +requires.7.namespace = org.eclipse.equinox.p2.iu +requires.7.name = org.eclipse.swt.gtk.linux.s390 +requires.7.range = 0.0.0 +requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390)) + +requires.8.namespace = org.eclipse.equinox.p2.iu +requires.8.name = org.eclipse.swt.gtk.solaris.sparc +requires.8.range = 0.0.0 +requires.8.filter = (&(osgi.os=solaris)(osgi.ws=gtk)(osgi.arch=sparc)) + +requires.9.namespace = org.eclipse.equinox.p2.iu +requires.9.name = org.eclipse.swt.gtk.solaris.x86 +requires.9.range = 0.0.0 +requires.9.filter = (&(osgi.os=solaris)(osgi.ws=gtk)(osgi.arch=x86)) + +requires.10.namespace = org.eclipse.equinox.p2.iu +requires.10.name = org.eclipse.swt.gtk.linux.ppc +requires.10.range = 0.0.0 +requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc)) + +requires.11.namespace = org.eclipse.equinox.p2.iu +requires.11.name = org.eclipse.swt.gtk.linux.ppc64 +requires.11.range = 0.0.0 +requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)) + +requires.12.namespace = org.eclipse.equinox.p2.iu +requires.12.name = org.eclipse.swt.gtk.linux.x86_64 +requires.12.range = 0.0.0 +requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)) + +requires.13.namespace = org.eclipse.equinox.p2.iu +requires.13.name = org.eclipse.swt.gtk.linux.ppcle64 +requires.13.range = 0.0.0 +requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppcle64)) + +requires.14.namespace = org.eclipse.equinox.p2.iu +requires.14.name = org.eclipse.swt.cocoa.macosx.x86_64 +requires.14.range = 0.0.0 +requires.14.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) + +requires.15.namespace = org.eclipse.equinox.p2.iu +requires.15.name = org.eclipse.swt.gtk.aix.ppc +requires.15.range = 0.0.0 +requires.15.filter = (&(osgi.os=aix)(osgi.ws=gtk)(osgi.arch=ppc)) + +requires.16.namespace = org.eclipse.equinox.p2.iu +requires.16.name = org.eclipse.swt.gtk.aix.ppc64 +requires.16.range = 0.0.0 +requires.16.filter = (&(osgi.os=aix)(osgi.ws=gtk)(osgi.arch=ppc64)) + +requires.17.namespace = org.eclipse.equinox.p2.iu +requires.17.name = org.eclipse.swt.gtk.hpux.ia64 +requires.17.range = 0.0.0 +requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)) diff --git a/local-build/org.eclipse.swt.fragments.localbuild/plugin.properties b/local-build/org.eclipse.swt.fragments.localbuild/plugin.properties new file mode 100644 index 0000000000..4d3b8455a5 --- /dev/null +++ b/local-build/org.eclipse.swt.fragments.localbuild/plugin.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2015 SAP SE and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# SAP SE - initial API and implementation +############################################################################### +pluginName = SWT fragments for local builds +providerName = Eclipse.org diff --git a/local-build/org.eclipse.swt.fragments.localbuild/pom.xml b/local-build/org.eclipse.swt.fragments.localbuild/pom.xml new file mode 100644 index 0000000000..2c1f9133a9 --- /dev/null +++ b/local-build/org.eclipse.swt.fragments.localbuild/pom.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 SAP SE and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + SAP SE - initial API and implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>eclipse.platform.swt</artifactId> + <groupId>eclipse.platform.swt</groupId> + <version>4.5.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + <groupId>org.eclipse.swt</groupId> + <artifactId>org.eclipse.swt.fragments.localbuild</artifactId> + <version>3.104.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> +</project> @@ -66,6 +66,7 @@ <modules> <module>bundles/org.eclipse.swt</module> + <module>local-build/org.eclipse.swt.fragments.localbuild</module> <module>bundles/org.eclipse.swt.tools</module> <module>examples/org.eclipse.swt.examples</module> <module>examples/org.eclipse.swt.examples.browser.demos</module> diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml index 1f04df85cc..e6057593da 100644 --- a/tests/org.eclipse.swt.tests/pom.xml +++ b/tests/org.eclipse.swt.tests/pom.xml @@ -12,10 +12,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>eclipse.platform.swt</artifactId> + <artifactId>eclipse.platform.swt.localbuild</artifactId> <groupId>eclipse.platform.swt</groupId> <version>4.5.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../local-build/local-build-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.tests</artifactId> |