Skip to content

Add required OSGi capability to wire o.e.swt to its native fragments #3561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
HannesWell wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add required OSGi capability to wire o.e.swt to its native fragments #3561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.aarch64; singleton:=true
Expand Down Expand Up @@ -29,3 +29,4 @@ SWT-WS: cocoa
SWT-OS: macosx
SWT-Arch: aarch64
Automatic-Module-Name: org.eclipse.swt.cocoa.macosx.aarch64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.cocoa.macosx.x86_64; singleton:=true
Expand Down Expand Up @@ -29,3 +29,4 @@ SWT-WS: cocoa
SWT-OS: macosx
SWT-Arch: x86_64
Automatic-Module-Name: org.eclipse.swt.cocoa.macosx.x86_64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.gtk.linux.aarch64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.aarch64; singleton:=true
Expand Down Expand Up @@ -34,3 +34,4 @@ SWT-WS: gtk
SWT-OS: linux
SWT-Arch: aarch64
Automatic-Module-Name: org.eclipse.swt.gtk.linux.aarch64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.gtk.linux.loongarch64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.loongarch64; singleton:=true
Expand Down Expand Up @@ -34,3 +34,4 @@ SWT-WS: gtk
SWT-OS: linux
SWT-Arch: loongarch64
Automatic-Module-Name: org.eclipse.swt.gtk.linux.loongarch64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.gtk.linux.ppc64le/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.ppc64le;singleton:=true
Expand Down Expand Up @@ -34,3 +34,4 @@ SWT-WS: gtk
SWT-OS: linux
SWT-Arch: ppc64le
Automatic-Module-Name: org.eclipse.swt.gtk.linux.ppc64le
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.gtk.linux.riscv64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.riscv64; singleton:=true
Expand Down Expand Up @@ -34,3 +34,4 @@ SWT-WS: gtk
SWT-OS: linux
SWT-Arch: riscv64
Automatic-Module-Name: org.eclipse.swt.gtk.linux.riscv64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
Expand Down Expand Up @@ -34,3 +34,4 @@ SWT-WS: gtk
SWT-OS: linux
SWT-Arch: x86_64
Automatic-Module-Name: org.eclipse.swt.gtk.linux.x86_64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.win32.win32.aarch64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.win32.win32.aarch64; singleton:=true
Expand Down Expand Up @@ -33,3 +33,4 @@ SWT-WS: win32
SWT-OS: win32
SWT-Arch: aarch64
Automatic-Module-Name: org.eclipse.swt.win32.win32.aarch64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
3 changes: 2 additions & 1 deletion binaries/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
Fragment-Host: org.eclipse.swt;bundle-version="[3.135.100,4.0.0)"
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.swt.win32.win32.x86_64; singleton:=true
Expand Down Expand Up @@ -33,3 +33,4 @@ SWT-WS: win32
SWT-OS: win32
SWT-Arch: x86_64
Automatic-Module-Name: org.eclipse.swt.win32.win32.x86_64
Provide-Capability: eclipse.swt;implementation="native";version:Version="3.135.100"
60 changes: 0 additions & 60 deletions binaries/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,60 +44,6 @@

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<!-- Always build the native fragments for all platforms SWT ships, regardless
of the build machine. Each fragment declares an Eclipse-PlatformFilter and is
only built when its environment is part of the target-platform configuration.
This overrides the running-environment-only setting from the root pom.xml, so
that all fragments are always built. Tests are unaffected and still run only
for the build machine's platform (see the tests modules in the root pom.xml). -->
<environments combine.self="override">
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>ppc64le</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>riscv64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>aarch64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -173,12 +119,6 @@
<artifactId>target-platform-configuration</artifactId>
<configuration>
<executionEnvironment>JavaSE-${maven.compiler.release}</executionEnvironment>
<dependency-resolution>
<profileProperties>
<!-- set property so that the filter condition on the p2 dependencies from org.eclipse.swt to the fragments does not match -->
<org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
</profileProperties>
</dependency-resolution>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Provide-Capability:
osgi.serviceloader;
osgi.serviceloader="com.github.weisj.jsvg.logging.LogManager";
register:="org.eclipse.swt.svg.logging.JVSGLoggerLogManager"

Require-Capability: eclipse.swt; filter:="(implementation=native)"
32 changes: 0 additions & 32 deletions bundles/org.eclipse.swt.svg/META-INF/p2.inf
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions bundles/org.eclipse.swt/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ Export-Package:
Eclipse-ExtensibleAPI: true
Bundle-RequiredExecutionEnvironment: JavaSE-21
Automatic-Module-Name: org.eclipse.swt
Require-Capability: eclipse.swt; filter:="(&(implementation=native)(version=3.135.100))"
46 changes: 0 additions & 46 deletions bundles/org.eclipse.swt/META-INF/p2.inf
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency-resolution>
<optionalDependencies>ignore</optionalDependencies>
<profileProperties>
<org.eclipse.swt.buildtime>true</org.eclipse.swt.buildtime>
<org.eclipse.equinox.p2.disable.require.capability.eclipse.swt>true</org.eclipse.equinox.p2.disable.require.capability.eclipse.swt>
</profileProperties>
</dependency-resolution>
</configuration>
Expand Down
1 change: 1 addition & 0 deletions examples/org.eclipse.swt.examples.ole.win32/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui.ide,
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-21
Automatic-Module-Name: org.eclipse.swt.examples.ole.win32
Require-Capability: eclipse.swt; filter:="(implementation=native)"
10 changes: 0 additions & 10 deletions examples/org.eclipse.swt.examples.ole.win32/META-INF/p2.inf
View file
Open in desktop

This file was deleted.

Loading