Skip to content

Move SVG rasterizer service to source folder #2484

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

Merged
merged 2 commits into from
Sep 4, 2025
Merged

Move SVG rasterizer service to source folder #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b34ff69
Version bump(s) for 4.38 stream
akoch-yatta Sep 3, 2025
ffde040
Move SVG rasterizer service to source folder
akoch-yatta Aug 26, 2025
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
1 change: 1 addition & 0 deletions bundles/org.eclipse.swt.svg/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
Copy link
Contributor

@laeubi laeubi Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

M2e is using excluding="**" that seem to prevent java files from being processed in such resource only folders.

Copy link
Contributor

@HeikoKlare HeikoKlare Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the concrete proposal/question here?

Copy link
Contributor

@laeubi laeubi Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<classpathentry kind="src" path="resources"/>
<classpathentry kind="src" path="resources" excluding="**"/>

that should prevent any java files from being placed here so you get a real "resource only" folder.

Copy link
Contributor

@HeikoKlare HeikoKlare Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I understand the idea, but (1) it's also a bit weird that if you place a Java file into an actual source folder (no matter whether it's called "resources") is not considered and (2) the pattern appears completely incomprehensible to me, so I am not sure if anywill will understand what this is supposed to do when taking a look at it or when dealing with issues potentially arising from it.

Copy link
Contributor

@laeubi laeubi Sep 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You wanted a "resource folder like maven" and that is how maven does it (or more formally m2e). That it is a "source folder" is an implementation detail of JDT because no one has minded to actually implement it like in maven (where resources can also be filtered for example before copied)

Copy link
Contributor

@HeikoKlare HeikoKlare Sep 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just tested and adding excluding="**" completely excludes the directory, thus rendering the change completely useless as the service file will not be placed in the bin folder anymore.

<classpathentry kind="output" path="bin"/>
</classpath>
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
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.swt.svg
Bundle-Version: 3.130.100.qualifier
Bundle-Version: 3.130.200.qualifier
Automatic-Module-Name: org.eclipse.swt.svg
Bundle-Name: %fragmentName
Bundle-Vendor: %providerName
Expand Down
4 changes: 3 additions & 1 deletion bundles/org.eclipse.swt.svg/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
#
# Contributors:
# Michael Bangas (Vector Informatik GmbH) - initial API and implementation
# Andreas Koch (Yatta Solutions GmbH) - add resources to source
###############################################################################
source.. = src/
source.. = src/,\
resources/
output.. = bin/
bin.includes = META-INF/,\
.,\
Expand Down
0 ....eclipse.swt.internal.image.SVGRasterizer → ....eclipse.swt.internal.image.SVGRasterizer
View file
Open in desktop
File renamed without changes.
Loading