From c4572a55c7e02c4c39416f9d6a2b461a449cdae9 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 27 Jan 2024 21:50:56 +0100 Subject: [PATCH] Link to java sources into native fragments to compile them in fragments Previously within the IDE workspace, the SWT java-sources for a platform have been compiled within the org.eclipse.swt project using a .classpath file specially crafted for each supported window-system/platform. Therefore when checking out the SWT sources in the IDE one had to rename the '.classpath_${ws}' template for the desired platform to '.classpath' to use it locally. With this change this renaming is not necessary anymore. Furthermore it allows PDE API-Tools to remove the built-in special handling of the org.eclipse.swt setup because now the API baseline check within the IDE can happen simply in the fragment as it exists in the baseline. --- .../.classpath_cocoa | 7 +- .../.classpath_gtk | 3 +- .../.classpath_win32 | 7 +- .../org.eclipse.core.resources.prefs | 0 binaries/.settings/org.eclipse.jdt.core.prefs | 15 + .../.project | 84 ++++ .../.project | 86 +++- .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.swt.gtk.linux.x86_64/.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../.project | 84 ++++ .../org.eclipse.core.resources.prefs | 2 - .../org/eclipse/swt/tools/internal/Sleak.java | 1 + .../Oomph/platformSwt.setup | 27 +- bundles/org.eclipse.swt/.classpath | 5 + .../org.eclipse.swt/.classpath_cocoa_aarch64 | 34 -- bundles/org.eclipse.swt/.gitignore | 4 - .../org.eclipse.swt/.settings/.api_filters | 464 +----------------- bundles/org.eclipse.swt/META-INF/MANIFEST.MF | 16 - .../build-scripts/CollectSources.java | 15 +- 26 files changed, 637 insertions(+), 563 deletions(-) rename bundles/org.eclipse.swt/.classpath_cocoa_x86_64 => binaries/.classpath_cocoa (85%) rename {bundles/org.eclipse.swt => binaries}/.classpath_gtk (93%) rename {bundles/org.eclipse.swt => binaries}/.classpath_win32 (82%) rename binaries/{org.eclipse.swt.cocoa.macosx.aarch64 => }/.settings/org.eclipse.core.resources.prefs (100%) create mode 100644 binaries/.settings/org.eclipse.jdt.core.prefs delete mode 100644 binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs delete mode 100644 binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs create mode 100644 bundles/org.eclipse.swt/.classpath delete mode 100644 bundles/org.eclipse.swt/.classpath_cocoa_aarch64 diff --git a/bundles/org.eclipse.swt/.classpath_cocoa_x86_64 b/binaries/.classpath_cocoa similarity index 85% rename from bundles/org.eclipse.swt/.classpath_cocoa_x86_64 rename to binaries/.classpath_cocoa index b323077f02b..7173e0ab710 100644 --- a/bundles/org.eclipse.swt/.classpath_cocoa_x86_64 +++ b/binaries/.classpath_cocoa @@ -8,11 +8,7 @@ - - - - - + @@ -29,6 +25,5 @@ - diff --git a/bundles/org.eclipse.swt/.classpath_gtk b/binaries/.classpath_gtk similarity index 93% rename from bundles/org.eclipse.swt/.classpath_gtk rename to binaries/.classpath_gtk index b83802978e0..4403efd6c03 100644 --- a/bundles/org.eclipse.swt/.classpath_gtk +++ b/binaries/.classpath_gtk @@ -5,7 +5,7 @@ - + @@ -31,6 +31,5 @@ - diff --git a/bundles/org.eclipse.swt/.classpath_win32 b/binaries/.classpath_win32 similarity index 82% rename from bundles/org.eclipse.swt/.classpath_win32 rename to binaries/.classpath_win32 index 4cf3f176dbc..0b9e7bc35eb 100644 --- a/bundles/org.eclipse.swt/.classpath_win32 +++ b/binaries/.classpath_win32 @@ -4,11 +4,7 @@ - - - - - + @@ -25,6 +21,5 @@ - diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/org.eclipse.core.resources.prefs b/binaries/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/org.eclipse.core.resources.prefs rename to binaries/.settings/org.eclipse.core.resources.prefs diff --git a/binaries/.settings/org.eclipse.jdt.core.prefs b/binaries/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..9478cb16537 --- /dev/null +++ b/binaries/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,15 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project index 7d12b551f44..b1330c9f98c 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project +++ b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_cocoa + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project index a132c296bc3..f3372f54364 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project +++ b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature - \ No newline at end of file + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_cocoa + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + + diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/.project b/binaries/org.eclipse.swt.gtk.linux.aarch64/.project index 7fce5f98971..c0a9b96b52d 100644 --- a/binaries/org.eclipse.swt.gtk.linux.aarch64/.project +++ b/binaries/org.eclipse.swt.gtk.linux.aarch64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.aarch64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project index 93f7e669b0c..f6bf0b29215 100644 --- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project +++ b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project index 0f8f65b3189..13d500587de 100644 --- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project +++ b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/.project b/binaries/org.eclipse.swt.gtk.linux.x86_64/.project index 79c840e77d7..8d72a47523d 100644 --- a/binaries/org.eclipse.swt.gtk.linux.x86_64/.project +++ b/binaries/org.eclipse.swt.gtk.linux.x86_64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_gtk + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.gtk.linux.x86_64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/.project b/binaries/org.eclipse.swt.win32.win32.x86_64/.project index 02ef08afd13..d086a9b2687 100644 --- a/binaries/org.eclipse.swt.win32.win32.x86_64/.project +++ b/binaries/org.eclipse.swt.win32.win32.x86_64/.project @@ -5,6 +5,11 @@ + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.pde.ManifestBuilder @@ -22,7 +27,86 @@ + org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature org.eclipse.pde.api.tools.apiAnalysisNature + + + .classpath + 1 + PARENT-1-PROJECT_LOC/.classpath_win32 + + + .settings + 2 + PARENT-1-PROJECT_LOC/.settings + + + Eclipse SWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT + + + Eclipse SWT Accessibility + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Accessibility + + + Eclipse SWT AWT + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20AWT + + + Eclipse SWT Browser + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Browser + + + Eclipse SWT Custom Widgets + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Custom%20Widgets + + + Eclipse SWT Drag and Drop + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Drag%20and%20Drop + + + Eclipse SWT OLE Win32 + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OLE%20Win32 + + + Eclipse SWT OpenGL + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20OpenGL + + + Eclipse SWT PI + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20PI + + + Eclipse SWT Printing + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Printing + + + Eclipse SWT Program + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20Program + + + Eclipse SWT WebKit + 2 + SWT_HOST_PLUGIN/Eclipse%20SWT%20WebKit + + + + + SWT_HOST_PLUGIN + $%7BPARENT-2-PROJECT_LOC%7D/bundles/org.eclipse.swt + + diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs b/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/binaries/org.eclipse.swt.win32.win32.x86_64/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java index c4127aa2318..883dcffb9e9 100644 --- a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java +++ b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/internal/Sleak.java @@ -32,6 +32,7 @@ * Modify the main method below to launch your application. * Run Sleak. */ +@SuppressWarnings("restriction") public class Sleak { List list; Canvas canvas; diff --git a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup index 3f6e82597f5..e80929a8f96 100644 --- a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup +++ b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup @@ -4,13 +4,14 @@ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0" + xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0" xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0" xmlns:setup="http://www.eclipse.org/oomph/setup/1.0" xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0" xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0" xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0" xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0" - xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore" + xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/pde/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore" name="swt" label="SWT"> Platform SWT - - + + + + diff --git a/bundles/org.eclipse.swt/.classpath b/bundles/org.eclipse.swt/.classpath new file mode 100644 index 00000000000..12be8d4f662 --- /dev/null +++ b/bundles/org.eclipse.swt/.classpath @@ -0,0 +1,5 @@ + + + + + diff --git a/bundles/org.eclipse.swt/.classpath_cocoa_aarch64 b/bundles/org.eclipse.swt/.classpath_cocoa_aarch64 deleted file mode 100644 index 07440032859..00000000000 --- a/bundles/org.eclipse.swt/.classpath_cocoa_aarch64 +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.eclipse.swt/.gitignore b/bundles/org.eclipse.swt/.gitignore index 867253bf3c8..c2120c4501e 100644 --- a/bundles/org.eclipse.swt/.gitignore +++ b/bundles/org.eclipse.swt/.gitignore @@ -1,5 +1 @@ -.classpath -ws/ -.build64/ -.buildas/ /bin_build/ diff --git a/bundles/org.eclipse.swt/.settings/.api_filters b/bundles/org.eclipse.swt/.settings/.api_filters index 715f2c17428..06d69ebb763 100644 --- a/bundles/org.eclipse.swt/.settings/.api_filters +++ b/bundles/org.eclipse.swt/.settings/.api_filters @@ -1,466 +1,10 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF index 2532d5f2ff6..f9ba502224d 100644 --- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF @@ -6,22 +6,6 @@ Bundle-Version: 3.125.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: plugin DynamicImport-Package: org.eclipse.swt.accessibility2 -Export-Package: - org.eclipse.swt, - org.eclipse.swt.accessibility, - org.eclipse.swt.awt, - org.eclipse.swt.browser, - org.eclipse.swt.custom, - org.eclipse.swt.dnd, - org.eclipse.swt.events, - org.eclipse.swt.graphics, - org.eclipse.swt.internal;x-friends:="org.eclipse.ui,org.eclipse.swt.tools.spies", - org.eclipse.swt.internal.image;x-internal:=true, - org.eclipse.swt.layout, - org.eclipse.swt.opengl, - org.eclipse.swt.printing, - org.eclipse.swt.program, - org.eclipse.swt.widgets Eclipse-ExtensibleAPI: true Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.swt diff --git a/bundles/org.eclipse.swt/build-scripts/CollectSources.java b/bundles/org.eclipse.swt/build-scripts/CollectSources.java index 587c847893d..d34676f91d2 100644 --- a/bundles/org.eclipse.swt/build-scripts/CollectSources.java +++ b/bundles/org.eclipse.swt/build-scripts/CollectSources.java @@ -31,7 +31,7 @@ */ public class CollectSources { - private record ScriptEnvironment(Path swtProjectRoot, Path targetDirectory, String ws, String arch) { + private record ScriptEnvironment(Path swtProjectRoot, Path binariesRoot, Path targetDirectory, String ws) { private static ScriptEnvironment read(String[] args) { if (args.length != 2) { throw new IllegalArgumentException("task and target directory must be defined as only argument"); @@ -40,10 +40,10 @@ private static ScriptEnvironment read(String[] args) { if (!swtProjectRoot.endsWith(Path.of("bundles/org.eclipse.swt"))) { // Consistency check throw new IllegalStateException("Sript must be excuted from org.eclipse.swt project"); } + Path binariesRoot = swtProjectRoot.getParent().getParent().resolve("binaries").toAbsolutePath(); Path targetDirectory = Path.of(args[1]); String ws = System.getProperty("ws"); - String arch = System.getProperty("arch"); - return new ScriptEnvironment(swtProjectRoot, targetDirectory, ws, arch); + return new ScriptEnvironment(swtProjectRoot, binariesRoot, targetDirectory, ws); } } @@ -68,7 +68,7 @@ private static void collectNativeSources(ScriptEnvironment env) throws IOExcepti String commonSources = sources.get("src_common"); String nativeSources = sources.get("src_" + env.ws); List allSources = Arrays.asList((commonSources + "," + nativeSources).split(",")); - System.out.println("Copy " + allSources.size() + " native source folders for " + env.ws + "." + env.arch); + System.out.println("Copy " + allSources.size() + " native source folders for " + env.ws); copySubDirectories(env.swtProjectRoot, allSources, env.targetDirectory, Set.of()); } @@ -82,13 +82,10 @@ private static Map loadProperties(Path path) throws IOException } private static void collectJavaSources(ScriptEnvironment env) throws Exception { - Path classpathFile = env.swtProjectRoot.resolve(".classpath_" + env.ws + "_" + env.arch); - if (!Files.isRegularFile(classpathFile)) { // prefer more specific - classpathFile = env.swtProjectRoot.resolve(".classpath_" + env.ws); - } + Path classpathFile = env.binariesRoot.resolve(".classpath_" + env.ws); Set srcClassPaths = readNativeJavaSourcesFromClasspath(classpathFile); Set excludedExtensions = Set.of("_properties", "extras", "bridgesupport"); - System.out.println("Copy " + srcClassPaths.size() + " java source folders for" + env.ws + "." + env.arch); + System.out.println("Copy " + srcClassPaths.size() + " java source folders for " + env.ws); copySubDirectories(env.swtProjectRoot, srcClassPaths, env.targetDirectory, excludedExtensions); }