diff options
5 files changed, 16 insertions, 69 deletions
diff --git a/bundles/org.eclipse.swt/META-INF/p2.inf b/bundles/org.eclipse.swt/META-INF/p2.inf index 64628e51c7..9fe76ac2ca 100644 --- a/bundles/org.eclipse.swt/META-INF/p2.inf +++ b/bundles/org.eclipse.swt/META-INF/p2.inf @@ -6,31 +6,21 @@ requires.1.range=0.0.0 # ensure that the applicable implementation fragment gets installed (bug 361901) requires.2.namespace = org.eclipse.equinox.p2.iu -requires.2.name = org.eclipse.swt.win32.win32.x86 +requires.2.name = org.eclipse.swt.win32.win32.x86_64 requires.2.range = [$version$,$version$] -requires.2.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true))) +requires.2.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) requires.3.namespace = org.eclipse.equinox.p2.iu -requires.3.name = org.eclipse.swt.win32.win32.x86_64 +requires.3.name = org.eclipse.swt.cocoa.macosx.x86_64 requires.3.range = [$version$,$version$] -requires.3.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) +requires.3.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) requires.4.namespace = org.eclipse.equinox.p2.iu -requires.4.name = org.eclipse.swt.gtk.linux.x86 +requires.4.name = org.eclipse.swt.gtk.linux.x86_64 requires.4.range = [$version$,$version$] -requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true))) +requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) requires.5.namespace = org.eclipse.equinox.p2.iu -requires.5.name = org.eclipse.swt.cocoa.macosx.x86_64 +requires.5.name = org.eclipse.swt.gtk.linux.ppc64le requires.5.range = [$version$,$version$] -requires.5.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) - -requires.6.namespace = org.eclipse.equinox.p2.iu -requires.6.name = org.eclipse.swt.gtk.linux.x86_64 -requires.6.range = [$version$,$version$] -requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) - -requires.7.namespace = org.eclipse.equinox.p2.iu -requires.7.name = org.eclipse.swt.gtk.linux.ppc64le -requires.7.range = [$version$,$version$] -requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) +requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true))) diff --git a/examples/org.eclipse.swt.examples.ole.win32/META-INF/p2.inf b/examples/org.eclipse.swt.examples.ole.win32/META-INF/p2.inf index f0d18417b7..a961ca2b27 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/META-INF/p2.inf +++ b/examples/org.eclipse.swt.examples.ole.win32/META-INF/p2.inf @@ -3,9 +3,3 @@ requires.0.namespace = org.eclipse.equinox.p2.iu requires.0.name = org.eclipse.swt.win32.win32.x86_64 #requires.0.range = [$version$,$version$] requires.0.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)) - - -requires.1.namespace = org.eclipse.equinox.p2.iu -requires.1.name = org.eclipse.swt.win32.win32.x86 -#requires.1.range = [$version$,$version$] -requires.1.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)) diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml index 204ac8e5dd..9901799c8c 100644 --- a/examples/org.eclipse.swt.examples.ole.win32/pom.xml +++ b/examples/org.eclipse.swt.examples.ole.win32/pom.xml @@ -33,11 +33,6 @@ <environment> <os>win32</os> <ws>win32</ws> - <arch>x86</arch> - </environment> - <environment> - <os>win32</os> - <ws>win32</ws> <arch>x86_64</arch> </environment> </environments> 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 index 7aac548cb4..f3edfabc91 100644 --- a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf +++ b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf @@ -1,30 +1,20 @@ # pull in the applicable implementation fragment at build time (bug 461427) requires.1.namespace = org.eclipse.equinox.p2.iu -requires.1.name = org.eclipse.swt.win32.win32.x86 +requires.1.name = org.eclipse.swt.win32.win32.x86_64 requires.1.range = 0.0.0 -requires.1.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86)) +requires.1.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)) requires.2.namespace = org.eclipse.equinox.p2.iu -requires.2.name = org.eclipse.swt.win32.win32.x86_64 +requires.2.name = org.eclipse.swt.cocoa.macosx.x86_64 requires.2.range = 0.0.0 -requires.2.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64)) +requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) requires.3.namespace = org.eclipse.equinox.p2.iu -requires.3.name = org.eclipse.swt.gtk.linux.x86 +requires.3.name = org.eclipse.swt.gtk.linux.x86_64 requires.3.range = 0.0.0 -requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)) +requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)) requires.4.namespace = org.eclipse.equinox.p2.iu -requires.4.name = org.eclipse.swt.cocoa.macosx.x86_64 +requires.4.name = org.eclipse.swt.gtk.linux.ppc64le requires.4.range = 0.0.0 -requires.4.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)) - -requires.5.namespace = org.eclipse.equinox.p2.iu -requires.5.name = org.eclipse.swt.gtk.linux.x86_64 -requires.5.range = 0.0.0 -requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)) - -requires.6.namespace = org.eclipse.equinox.p2.iu -requires.6.name = org.eclipse.swt.gtk.linux.ppc64le -requires.6.range = 0.0.0 -requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)) +requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)) diff --git a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml index e0ce8c6eda..2b402cc875 100644 --- a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml +++ b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml @@ -20,17 +20,6 @@ </license> <plugin - id="org.eclipse.swt.gtk.linux.x86" - os="linux" - ws="gtk" - arch="x86" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin id="org.eclipse.swt.gtk.linux.x86_64" os="linux" ws="gtk" @@ -64,17 +53,6 @@ unpack="false"/> <plugin - id="org.eclipse.swt.win32.win32.x86" - os="win32" - ws="win32" - arch="x86" - download-size="0" - install-size="0" - version="0.0.0" - fragment="true" - unpack="false"/> - - <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" os="macosx" ws="cocoa" |