From 9cbe48bcb9ae7ee322e334659fba30d1e73981c7 Mon Sep 17 00:00:00 2001 From: sebthom Date: Thu, 15 Feb 2024 12:58:57 +0100 Subject: [PATCH 01/12] bump tm4e versions for next development iteration --- org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.core.tests/pom.xml | 2 +- org.eclipse.tm4e.core/META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.core/pom.xml | 2 +- org.eclipse.tm4e.feature/feature.xml | 2 +- org.eclipse.tm4e.feature/pom.xml | 2 +- org.eclipse.tm4e.language_pack.feature/feature.xml | 2 +- org.eclipse.tm4e.language_pack.feature/pom.xml | 2 +- org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.language_pack/pom.xml | 2 +- org.eclipse.tm4e.language_pack/updater/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.languageconfiguration.tests/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.languageconfiguration/pom.xml | 2 +- org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF | 8 ++++---- org.eclipse.tm4e.markdown/pom.xml | 2 +- org.eclipse.tm4e.registry/META-INF/MANIFEST.MF | 4 ++-- org.eclipse.tm4e.registry/pom.xml | 2 +- org.eclipse.tm4e.repository/pom.xml | 2 +- org.eclipse.tm4e.samples/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.tm4e.samples/pom.xml | 2 +- org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF | 2 +- org.eclipse.tm4e.ui.tests/pom.xml | 2 +- org.eclipse.tm4e.ui/META-INF/MANIFEST.MF | 6 +++--- org.eclipse.tm4e.ui/pom.xml | 2 +- pom.xml | 4 ++-- target-platform/pom.xml | 2 +- 28 files changed, 43 insertions(+), 43 deletions(-) diff --git a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF index 3d533a729..5abf97642 100644 --- a/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Require-Bundle: org.apache.batik.css;resolution:=optional, org.apache.batik.util;resolution:=optional, com.google.gson;resolution:=optional, diff --git a/org.eclipse.tm4e.core.tests/pom.xml b/org.eclipse.tm4e.core.tests/pom.xml index c0f4391b2..5d004fcd0 100644 --- a/org.eclipse.tm4e.core.tests/pom.xml +++ b/org.eclipse.tm4e.core.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.core.tests diff --git a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF index 902e56968..98b34f507 100644 --- a/org.eclipse.tm4e.core/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.core -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Require-Bundle: com.google.gson;bundle-version="[2.10.1,3.0.0)", org.apache.batik.css;bundle-version="[1.16.0,2.0.0)";resolution:=optional, org.apache.batik.util;bundle-version="[1.16.0,2.0.0)";resolution:=optional, diff --git a/org.eclipse.tm4e.core/pom.xml b/org.eclipse.tm4e.core/pom.xml index d503d1417..89c375ce3 100644 --- a/org.eclipse.tm4e.core/pom.xml +++ b/org.eclipse.tm4e.core/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.core diff --git a/org.eclipse.tm4e.feature/feature.xml b/org.eclipse.tm4e.feature/feature.xml index 1d34cc572..26f989d7f 100644 --- a/org.eclipse.tm4e.feature/feature.xml +++ b/org.eclipse.tm4e.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.tm4e.feature/pom.xml b/org.eclipse.tm4e.feature/pom.xml index 8a2ce43a4..92da0d2db 100644 --- a/org.eclipse.tm4e.feature/pom.xml +++ b/org.eclipse.tm4e.feature/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.feature diff --git a/org.eclipse.tm4e.language_pack.feature/feature.xml b/org.eclipse.tm4e.language_pack.feature/feature.xml index 82bf796b7..c3588b215 100644 --- a/org.eclipse.tm4e.language_pack.feature/feature.xml +++ b/org.eclipse.tm4e.language_pack.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.tm4e.language_pack.feature/pom.xml b/org.eclipse.tm4e.language_pack.feature/pom.xml index 1a5acd8b4..5ec25e0b3 100644 --- a/org.eclipse.tm4e.language_pack.feature/pom.xml +++ b/org.eclipse.tm4e.language_pack.feature/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.language_pack.feature diff --git a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF index 94530a946..b1afda3b1 100644 --- a/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.language_pack/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.language_pack;singleton:=true -Bundle-Version: 0.10.0.qualifier -Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.10.0", - org.eclipse.tm4e.registry;bundle-version="0.10.0", - org.eclipse.tm4e.languageconfiguration;bundle-version="0.10.0", +Bundle-Version: 0.10.1.qualifier +Require-Bundle: org.eclipse.tm4e.ui;bundle-version="0.10.1", + org.eclipse.tm4e.registry;bundle-version="0.10.1", + org.eclipse.tm4e.languageconfiguration;bundle-version="0.10.1", org.eclipse.ui.editors;bundle-version="[3.3.0,4.0.0)", org.eclipse.ui.genericeditor;bundle-version="[1.0.0,2.0.0)", org.eclipse.core.contenttype;bundle-version="[3.2.0,4.0.0)" diff --git a/org.eclipse.tm4e.language_pack/pom.xml b/org.eclipse.tm4e.language_pack/pom.xml index daebc9e6d..4dc1810f9 100644 --- a/org.eclipse.tm4e.language_pack/pom.xml +++ b/org.eclipse.tm4e.language_pack/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.language_pack diff --git a/org.eclipse.tm4e.language_pack/updater/pom.xml b/org.eclipse.tm4e.language_pack/updater/pom.xml index 1cae2c9d4..1c501f00d 100644 --- a/org.eclipse.tm4e.language_pack/updater/pom.xml +++ b/org.eclipse.tm4e.language_pack/updater/pom.xml @@ -9,7 +9,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT ../.. diff --git a/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF index c4af7a983..bb76c425e 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.languageconfiguration.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for TM4E language configuration support Bundle-SymbolicName: org.eclipse.tm4e.languageconfiguration.tests;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Bundle-Vendor: Eclipse TM4E Automatic-Module-Name: org.eclipse.tm4e.languageconfiguration.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.tm4e.languageconfiguration.tests/pom.xml b/org.eclipse.tm4e.languageconfiguration.tests/pom.xml index be5b8bf82..130b88799 100644 --- a/org.eclipse.tm4e.languageconfiguration.tests/pom.xml +++ b/org.eclipse.tm4e.languageconfiguration.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.languageconfiguration.tests diff --git a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF index e17da37d0..862be72c9 100644 --- a/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.languageconfiguration/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.languageconfiguration;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filebuffers, @@ -17,9 +17,9 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.ui.genericeditor, org.eclipse.ui.ide, org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tm4e.registry;bundle-version="0.10.0", - org.eclipse.tm4e.core;bundle-version="0.10.0", - org.eclipse.tm4e.ui;bundle-version="0.10.0", + org.eclipse.tm4e.registry;bundle-version="0.10.1", + org.eclipse.tm4e.core;bundle-version="0.10.1", + org.eclipse.tm4e.ui;bundle-version="0.10.1", com.google.gson;bundle-version="[2.10.1,3.0.0)" Bundle-Activator: org.eclipse.tm4e.languageconfiguration.LanguageConfigurationPlugin Export-Package: org.eclipse.tm4e.languageconfiguration, diff --git a/org.eclipse.tm4e.languageconfiguration/pom.xml b/org.eclipse.tm4e.languageconfiguration/pom.xml index 8ce48a6aa..86d27814b 100644 --- a/org.eclipse.tm4e.languageconfiguration/pom.xml +++ b/org.eclipse.tm4e.languageconfiguration/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.languageconfiguration diff --git a/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF b/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF index 960dc9184..ac26afb83 100644 --- a/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.markdown;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Require-Bundle: org.eclipse.core.runtime, - org.eclipse.tm4e.core;bundle-version="0.10.0", - org.eclipse.tm4e.registry;bundle-version="0.10.0", - org.eclipse.tm4e.ui;bundle-version="0.10.0" + org.eclipse.tm4e.core;bundle-version="0.10.1", + org.eclipse.tm4e.registry;bundle-version="0.10.1", + org.eclipse.tm4e.ui;bundle-version="0.10.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.tm4e.markdown, org.eclipse.tm4e.markdown.marked diff --git a/org.eclipse.tm4e.markdown/pom.xml b/org.eclipse.tm4e.markdown/pom.xml index 1f054c5e9..21da7a884 100644 --- a/org.eclipse.tm4e.markdown/pom.xml +++ b/org.eclipse.tm4e.markdown/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.markdown diff --git a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF index 158512970..dff1ad293 100644 --- a/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.registry/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.tm4e.registry;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.preferences, - org.eclipse.tm4e.core;bundle-version="0.10.0", + org.eclipse.tm4e.core;bundle-version="0.10.1", com.google.gson;bundle-version="[2.10.1,3.0.0)" Export-Package: org.eclipse.tm4e.registry Bundle-Activator: org.eclipse.tm4e.registry.TMEclipseRegistryPlugin diff --git a/org.eclipse.tm4e.registry/pom.xml b/org.eclipse.tm4e.registry/pom.xml index 088290eb7..447dd1221 100644 --- a/org.eclipse.tm4e.registry/pom.xml +++ b/org.eclipse.tm4e.registry/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.registry diff --git a/org.eclipse.tm4e.repository/pom.xml b/org.eclipse.tm4e.repository/pom.xml index b9e83fbd8..45448da8e 100644 --- a/org.eclipse.tm4e.repository/pom.xml +++ b/org.eclipse.tm4e.repository/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.repository diff --git a/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF b/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF index 03b84bb15..f2877e697 100644 --- a/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.samples/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.samples;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Require-Bundle: org.eclipse.jface.text, org.eclipse.core.runtime, org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.genericeditor;bundle-version="1.0.0";resolution:=optional, - org.eclipse.tm4e.core;bundle-version="0.10.0", - org.eclipse.tm4e.ui;bundle-version="0.10.0" + org.eclipse.tm4e.core;bundle-version="0.10.1", + org.eclipse.tm4e.ui;bundle-version="0.10.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.tm4e.samples diff --git a/org.eclipse.tm4e.samples/pom.xml b/org.eclipse.tm4e.samples/pom.xml index 2e1bc337e..67ebd97b2 100644 --- a/org.eclipse.tm4e.samples/pom.xml +++ b/org.eclipse.tm4e.samples/pom.xml @@ -4,7 +4,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.samples diff --git a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF index cb896a53c..c1c482c89 100644 --- a/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.ui.tests;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Require-Bundle: org.eclipse.jface.text, org.eclipse.core.filesystem, org.eclipse.core.resources, diff --git a/org.eclipse.tm4e.ui.tests/pom.xml b/org.eclipse.tm4e.ui.tests/pom.xml index 04dc948ac..bb2fe8285 100644 --- a/org.eclipse.tm4e.ui.tests/pom.xml +++ b/org.eclipse.tm4e.ui.tests/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.ui.tests diff --git a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF index 630a641f5..e4e96272c 100644 --- a/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.tm4e.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.tm4e.ui;singleton:=true -Bundle-Version: 0.10.0.qualifier +Bundle-Version: 0.10.1.qualifier Require-Bundle: org.eclipse.core.expressions, org.eclipse.core.filesystem, org.eclipse.core.resources, @@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.core.expressions, org.eclipse.ui.trace;resolution:=optional, org.eclipse.ui.workbench.texteditor, org.eclipse.e4.ui.css.swt.theme, - org.eclipse.tm4e.core;bundle-version="0.10.0", - org.eclipse.tm4e.registry;bundle-version="0.10.0", + org.eclipse.tm4e.core;bundle-version="0.10.1", + org.eclipse.tm4e.registry;bundle-version="0.10.1", com.google.gson;bundle-version="[2.10.1,3.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.tm4e.ui, diff --git a/org.eclipse.tm4e.ui/pom.xml b/org.eclipse.tm4e.ui/pom.xml index 71415a546..805782ca0 100644 --- a/org.eclipse.tm4e.ui/pom.xml +++ b/org.eclipse.tm4e.ui/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e.ui diff --git a/pom.xml b/pom.xml index 441d955b5..c55022308 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT pom @@ -86,7 +86,7 @@ org.eclipse.tm4e tm4e-target - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT diff --git a/target-platform/pom.xml b/target-platform/pom.xml index 08ebe6de6..323e3ef57 100644 --- a/target-platform/pom.xml +++ b/target-platform/pom.xml @@ -5,7 +5,7 @@ org.eclipse org.eclipse.tm4e - 0.10.0-SNAPSHOT + 0.10.1-SNAPSHOT org.eclipse.tm4e From 363e86df4e5e9ba665a72b79adaf886a6df92895 Mon Sep 17 00:00:00 2001 From: sebthom Date: Thu, 15 Feb 2024 13:06:02 +0100 Subject: [PATCH 02/12] docs: extend instructions for creating new releases --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a14ec1a02..fb4185673 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -126,4 +126,6 @@ GitHub provides additional documentation on [forking a repository](https://help. 1. Upon completion of the build, run https://ci.eclipse.org/tm4e/job/promote-snapshot-to-release/ with version `x.y.z` 1. Create a new `x.y.z` release entry on GitHub, from the `x.y.z` tag. 1. Create a new `x.y.z` release entry on https://projects.eclipse.org/projects/technology.tm4e +1. Create a PR to update https://github.com/eclipse-simrel/simrel.build/blob/main/tm4e.aggrcon 1. (Optionally) Announce on mailing-lists. social media... +1. Run `python bump-version.py patch` and commit all changed pom.xml/feature.xml/MANIFEST.MF files to `main` branch From 57f11bcd259a6d81b540399e7a96c0a337f1f031 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 11:01:16 +0100 Subject: [PATCH 03/12] feat: bind *.aggr,*.aggrcon files to org.eclipse.core.runtime.xml --- org.eclipse.tm4e.language_pack/plugin.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml index 47c20cecf..722b220ec 100644 --- a/org.eclipse.tm4e.language_pack/plugin.xml +++ b/org.eclipse.tm4e.language_pack/plugin.xml @@ -49,11 +49,24 @@ + + + + + + + + + - + + + + From f3f08dd875d00043ff467997c2f080541c0674f7 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 11:50:40 +0100 Subject: [PATCH 04/12] fix: langpack icons don't have transparent background #709 --- .../syntaxes/git-base/icon.png | Bin 1059 -> 189 bytes .../syntaxes/git-base/icon@2x.png | Bin 1253 -> 393 bytes .../syntaxes/markdown-math/icon.png | Bin 969 -> 176 bytes .../syntaxes/markdown-math/icon@2x.png | Bin 1041 -> 323 bytes .../syntaxes/search-result/icon.png | Bin 1012 -> 224 bytes .../syntaxes/search-result/icon@2x.png | Bin 1276 -> 456 bytes .../updater/pom.xml | 6 ------ .../VSCodeSingleExtensionSourceHandler.java | 19 ++++++++---------- 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/org.eclipse.tm4e.language_pack/syntaxes/git-base/icon.png b/org.eclipse.tm4e.language_pack/syntaxes/git-base/icon.png index 89e0ae9f8141f1b657f3c2a3d13cdd5070490076..7721bfca0bb333dab53b89d7c87107e66b60bcf8 100644 GIT binary patch delta 172 zcmV;d08{^?2)zN28Gi-<001BJ|6u?C0E9_IK~#8NrH#uCfFKY=@nQ=W;Y~^GLiAuE z7Hb`9^zJX&1SSjtoMbu7=b=@Go zK4Iu9QV5!O(h<-xYB$FL9s+iwXUv0;P%cmkiOC$X67#*XizTaRX7sS{75)#LMiA0*-Mp7%Mw=Q;V# z=CYsG#y7`_sJ1oJybr${!sm?`zIW_gzn>^ZxzF=0D2bRzh?K~PJXFlYLaf9_?BP(D zL`amxNIdi^lM1Pl8mWh?#$-aKWJcytB4=_TS8^jq0c}V_3zyODVNQ62S(%O5!&p=z zEXram9w>0A!m6ys>H!M9CTz-PYz{_TWfyj3H+D<~HN*f7N?_p(gP{#+XyLL4L!ri_ zA|~R&AI73m6*W;0c0qwdQ!x{BxCaz^#Z}zIVGnr#6Solu`~w0GK@BlLgA%Raz+h-Y z8d@Hb3&*JOn5u^$;SXa`nW;H)g~KJb1#Wy1KeVB2iyo-_X#IOeRyQRAXafQ&Uqqoz7%3 z*=#nS&$qR;6$%AxtE;Q4r>Cd4x3{maZ(v}cSS$_>4h{_s4G#~ON~MvJkq|@4eqCbn46G z{jtUVgI3trlD;}KaV&mjdd<5>QjaPA$ASLqxeJxg#yayIJe;ce@as=5@9%#2_df?L zdE=W$so2ANA3x{$N>(h5Y5B(SHR~qYXPUat{SZI( z(Z<-DBlCxTiT!-|%69(Z&igm{NHtx4n_oVAS#xpm?$K}eoO_b3Zh7zYuJ8UzB%aRi zttqzucaMJU{C&&Ochv9dUqK~#8N#gsix!$1&)jR*=iprzmhI1;T} z8j=+BRP;35jvGWumzJ7}C`y-Nainat{yZ~YdpG8jo|MeKH*fPJ7exZwMd^;>{NmJ& zSH67oORUQBhUKGPf~6Gw*>P|8w=AWYNya@tOvAz+_hkK9w&SxLYHM|`5kuQ;EAWl!@B=gc;ssY|Ij5t=QfWK0;6lp|xpFxB=ye$iw3 zqu>&2VLdz0qj`J5W!h4nYra8nX{@*>2`=vv^I2etCg!rjGK&6-z|v96J^xzn$x;3X XYFcn@=nMu400000NkvXXu0mjf7S+21 literal 1253 zcmW-h4@?wP9LIln84PAH)H=!Nq+?TLg*`@)lpNqXLJ0BJ3_~xr9-9KSbHU{h5Mjz? z8@Yi!b^@I;m{VNqwg`psr@++%gE3)N#0Z$MrkI2&=&Y&hq0)n6jC8q*aZbHg_1%cMoiy5eJxH7!E-VF+k%bu)u-A(1x_qE7IM#MvbGeF$4*J7>i0Or5EU1zozhQ zRPWQbBn{=uU9Z;{rDpV{qqprdtdV^l^zwaJ+JSEpr15pYmJl91VN_^nsL^N)4-Yq+ z%~4TNF)=Z5adC->iOI>yR;x8LGt*|X<>chp?RIRdprF9va5$aLva+(Osw$VuRa;wI zUtjNbyFDIHTU%Rud%M@`?dFF657=XRe(b0*CiOI>ynVFe|g@wh%#pUJY)zwwg zw!D5Kzvi@5i_Lkvdf%?}{-h1%87Z5$`~B3?={C)0pG)?)Y>559(UjD?w=ksP=2sEk zsb4EkHchRG6dzU>ylMTyuQxd4bjSYtHzR*IayG6v=<|nn@0Q#vxp!!z!w|fjUslxG za9~qm!q{YM3zdf6_^9xe{FEDaE;Y)zBRlNVxA$BdcWpg0cxrwjtfjfBq5DF^Kk28& zTl2O*J2vx4`3X}3heeb$Qp7}37ptyIg;^}W&-+yVuG89?i`0Lh--_CWeSqdsJ zZ5%wf6!6)4>+$ca{wzLg9X1%ARtMiYb2Yl}s3m@S_FSdYQ~1UZAK7`#d>|&;64to# z!u|a8;g!RKEyZIUkDHHvy7S=W!#rj0^!&u^N?zF8zo$Jq@98#O&zkDlR`k}@QCH4u vn>T&jm2lyBE2|#*L3|P8s z8L~W>|N6~q6#kDNKj3@}16bKPz!;f*;^axV1`z+vn>TPiP6L=(*~m8lorW0zGZ2KQ zO`i@H!)d^ShY#U=bQc&J8^ie+1`rBFbbw(1sQ_jG2%skrVi@so0070pn>$UJqQn3I N002ovPDHLkV1n1}JAnWI literal 969 zcmW-gQAm?v6oyY3C8AVHp%r4}MGb<{2fGrir8FUy)WFzHzZxe9N$|#9&5R`|1YSvp z7R0Dn7Y&NtWPyU@O$P!g8eXg$!4SehBpI{Q`~5#`s#_&mX=))Ift*Q~fB391#-&9gAaiY@Py# z!cN4AIx!E0US+4^RGk_aan%_+6KCoSQ$YBzH!~y?+fJ0D24A7uND>yJ1+K`5p`Q-dD zYCI}pK1le(SX8Q_hFoD66gU)9G31D(5dgT*j-cTdQ6dju;x^&{6AZ&4s38Vu+yoXl zFc{j9Hoqd@jbqe!3>!m`@Q1Oe)XXn1T)(FXH|qBpF3CfMx%>5oQF_KO9l!0+utyF( z_~nOK-a$AC()c@IO9&61Fsik+wY|N)v$M0iyE_tzM5EDIEY{Q06OYFei9|A)Or=uk zbUFwEY-?<6Y+_;}lgVVW*<3C+H#avwKfkcBkk97}g+j4dER{;-a(Quaad~-pb#)c? z*4EZ4l}fc*-PqXJ+S;nsYCAhS^?JSQ+{g;vfZRaerBr5pG2maqr<^S@aJ^eHedZXHZxTinoi%m__y@-j0XFUzG;5c z+}!)FGlV_?s1&kPCk0F z0HEqu7Cn1WKM5fCe7^9pOn`y8e7N{3|0E!y5&-Nuaom;I zDi_EfL`A3$8Z5?eG!~~Qr2_w^odQjNjvN0W(P%V{@c;|pwx1ptT|EE*002ovPDHLk FV1h#egDn66 literal 1041 zcmW-gUr5tY6vt26RLuDxmLoze>>(*yT(UsXvPm;yL@g+x7!{WyDUgai*!+V@N#uIS zIv`0S!c6QTiIAvavJ6fyN+CU1p+pRVK_Ein>3e?{wjYOk@ArJZ-}C$3ITktWFWy{C zME;g==s2EL?pKtL|IpL^3{gHEI~r|9No0sD5fcfKy2=r- z)lp!RtzkAShSfpgtXLy#M2sjHan-0b%0|T~x`G;FfCeS7u!qLbhBUNrS)CzQW3jbj ztvY{bi;CH@SXO5j6xbBDB32ac0fn&sQ+(sPm4+uB}HN*f7N*o0T8bce> z&{CJ2+eVEg%<6)KKeR<9!lK9(c0qwnR$)bsNE!iv3&#;O+#*Wk0ZiOR9AJWBI0QAs z0F9f#0tXsH8`A1VdAeCMG5) zC)4S4CX<1^+1c6o`T2!~g{7sXY&M(A<(8M1S65f7cAWcwFF;yC2cz+C=VJk1Ra(-y z5x$yVy8q>H_x@-} zoh2nN8iK)V#p^!b%D&BXjnVqEH`bniyyPpo80^!j6kVA*Q&7;{R~IiI%WFAuXy;;l zCY}3RI#&_hH?t==@v7%^YIO9#@x6V8U;JZ#K5gsV`t0@Pyp#10R|ZDAo^1Jbs9^Ye zTcdw_@@9AW_)2 z=oq91D?nFB2%`WTHs5>q<39-e`TGw{qsXJU1dC=24M1GB{RyfV7+?!990p*Bg98?e zA`qT<>?MX6h5;aqt^lV(T;k{oV3?!s+<%7BQ}{LGGXSO-8Azb3ff#@#5OFF-$MDoi zj%E;s1872e_w5g+B3u|FNuw(ugs}n~Ng4%X*o+Ne30Pd&830O3_}+Ft&T0Sv002ov JPDHLkV1kTlPrd*E literal 1012 zcmW-gUr5tY6vq!~X4=XON=htp4<<#68}{Ie8k$pLS?)oUVrbj~jX+SAkcg?!Fc?w7 zjp2hBnAs{4k|AOLB;jDTClRqAp%6nWoG-%Zdw)OJ#^Ij(J)iIQ?02s^P~pnjpG8Ej zN`Kj9{N~tCW*WYWj_s-;N~7uv!E%&DibxX~A|?`BDMd^>GTo!A{)_9E8 zthHEw7>mjnZCD$zc0qwdHkw(pz&)VQtHo$xEwG0?fQj3P1O5R4hoFWSph1aNa9}XB zAq_3D$=PGnc-R=RLBb!#qGC2I$Q5=$fkPu~1UVvU1OP6yBWSoql*j{^xQ#f#1jBF$ zYKQ?EH-QBX42CwO#jeP9;}|s_!Nw3I{9!CA7O@L-)^91CjoN)WOR`W-?smOSl$Oy+ z$8Os(Y>^!gcKHsLb>K{bH2x0Q62gNgjLOZ;&CAOxC@65d-NnVl9*?J_q{Qp>`g}gW z-yaABg27;2U0o;?!nT^5n_F61!r^d7M@M&ecO(*tMx*`x{jpeVaBy&VcsL%9kByBb z5{b#l$*HL+*h?mpb8~Zxi;GK3OUuj4Yinz%RBCf`^U#ro4|oG!RF<6!hUc$bEZy7X z$%(nfvwMDRA077g#Xe@tysI1?`g^$cNpeqSPjtf*4;@{&Gd*)HwXf^3JH74gzer(c za^+La$?2;6Q0M*cO%HZA42`Z9t(KmtuNrv8?Ozx24<7&B?$Lpn=U3MY{C%6_88=_M zYu}`w?!Eqb+m?~@mnLr9u75w!dZOa#%O4|c6X9FEUuJ7+U3dQ!MxMDQHs+hMcW!O` h*}BrWBhfM|8{ZD3&YpTC>ksYQTUj0`i~B-d{{dOy=2QRx diff --git a/org.eclipse.tm4e.language_pack/syntaxes/search-result/icon@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/search-result/icon@2x.png index d1567b906c459993c197e9204d4beb6273c500bb..33f435d494dd308245c365b0492d3588491cc1dc 100644 GIT binary patch delta 441 zcmV;q0Y?7(3CIJG8Gi-<0047(dh`GQ0gp*UK~#8Ny_dU613?sq;{*64zJcH~So#vF zR1}jmwsv-s*1}%P1;HvLSucg45K|}wf}K&p3mQF>%*gy_?z`&`U-Qqo1+ueeYqeOl zuBNp{Zidb(QS+QP3!$(Yd50B^rJ3hgHcVKkC{e=XvIr6;m4A&>7#x627^h(r{aG;3 zfmAk_=w}<uyJO;sk5{&8?d<1Xj|Va0-LVCO``;sWL36cCawHC`pRklr0!G;8^jZ jezc{tOu61237_Xbp-Z5QYlt%h00000NkvXXu0mjf8061; literal 1276 zcmW-heM}of7{;%lW?(9x(QYoR1Pm0!l$^tDG6_&Vnz4p#of6_=A@kUpng}xn!p4Te zHi`)iOS@gt4Trd~514~0hGoiFhd7VO@Sg@F=s+cPgrXZnMm(SEC6v6m_n!CnJa5ys za!ZLedQ&tZL~AZJ?ZJP&`r8nRPg9R`jF3oDUS=&qNeCr`5yA-(gh*9UN+=_g6DkOm z>XK2y7-5_+L6}s%oD$9m=Y$KwrFtqT5sU~+ zbr_|bQbDOyV^J|i8K+E8CKUxPIis9YE-04@3cZ3+!Kn~bNHF3lm5fSGrJxd1K@BlL zgA!P{!(eDb8d`WPl_6E*aK;2kW}j>N_gB>Z74Dj}s> zV0itCBD_(x&+w8IR5*9F-f)zPF`SOtcG$2&4tr3`4`V3@;YpCj*8y8Xc<_W#@$vCG zoh~UUDK#}UBO}9TH0I>wj)dPDUcLNr5WQ@*u+`n|okEO(5tZ=~((jQ+AA;;S!w37J8E%TvCL2O3@Msb)<^ z^1xfw_J)Y_q$hoYiC0xO8=j3T+!$H-!(_m2_ioFxoW6Ox=2+L_lOmVXY3+$^B^S?L zyyQ;w*ptUin$}6fM1t$h6#c0yX^Cxf!_m9CgO$aTA3W{cQxc^)w4G=k6hC_AAI(1Z zL%Fhcxope1D&PHzS3kK{a=UhGW7^W})nLQW?vj;AnK3WsdCuVvY4`*fX{w^!|$n^Ea@wCr|UN2kAcYJJF zU0{#0$0lZMDJy667vfJeteSRcjm1lI^ABG*R9SHFo6WQA-S)>NqnBsT9K9LXYVF?k zxUs^Y?H=h^Ud%WD{O`+U|CxR~=>AoAGV8Uz0Y}brwKr;`8uzomj=bc`+Ma$T?@!*d zH{IRV)id4YiuZOrzh&o+`<|U6%L{i0%{A?B|F-;hXdtCRzscQcdq*daX;%F))1Mpe Psb4X3k;T+sVEgEQMN(&X diff --git a/org.eclipse.tm4e.language_pack/updater/pom.xml b/org.eclipse.tm4e.language_pack/updater/pom.xml index 1c501f00d..8eb15a9c3 100644 --- a/org.eclipse.tm4e.language_pack/updater/pom.xml +++ b/org.eclipse.tm4e.language_pack/updater/pom.xml @@ -59,11 +59,5 @@ - - - net.coobird - thumbnailator - 0.4.20 - \ No newline at end of file diff --git a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/VSCodeSingleExtensionSourceHandler.java b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/VSCodeSingleExtensionSourceHandler.java index 08d440953..f6bd91cd1 100644 --- a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/VSCodeSingleExtensionSourceHandler.java +++ b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/VSCodeSingleExtensionSourceHandler.java @@ -17,7 +17,6 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; -import java.awt.Transparency; import java.awt.image.BufferedImage; import java.io.IOException; import java.nio.file.Files; @@ -28,7 +27,6 @@ import javax.imageio.ImageIO; -import net.coobird.thumbnailator.Thumbnails; import updater.Updater.Config; import updater.Updater.State.ExtensionState; import updater.Updater.State.LanguageState; @@ -107,8 +105,8 @@ void handle() throws IOException { final var targetIcon = targetSyntaxDir.resolve("icon.png"); logInfo("Copying file [icon.png]..."); final var sourceIcon = ImageIO.read(sourceExtensionDir.resolve(pkgJson.icon()).toFile()); - Thumbnails.of(sourceIcon).size(16, 16).outputFormat("png").toFile(targetIcon.toFile()); - Thumbnails.of(sourceIcon).size(32, 32).outputFormat("png").toFile(targetSyntaxDir.resolve("icon@2x.png").toFile()); + ImageIO.write(resizeImage(sourceIcon, 16, 16), "png", targetIcon.toFile()); + ImageIO.write(resizeImage(sourceIcon, 32, 32), "png", targetSyntaxDir.resolve("icon@2x.png").toFile()); } for (final Entry lang : pkgJsonLangs.entrySet()) { @@ -149,9 +147,8 @@ void handle() throws IOException { logInfo("Copying image [" + langCfg.icon().light() + "] -> [" + targetIcon.getFileName() + "]...", false); try { final var sourceIcon = ImageIO.read(sourceExtensionDir.resolve(langCfg.icon().light()).toFile()); - Thumbnails.of(sourceIcon).size(16, 16).outputFormat("png").toFile(targetIcon.toFile()); - Thumbnails.of(sourceIcon).size(32, 32).outputFormat("png") - .toFile(ctx.targetDir().resolve(langId + "@2x.png").toFile()); + ImageIO.write(resizeImage(sourceIcon, 16, 16), "png", targetIcon.toFile()); + ImageIO.write(resizeImage(sourceIcon, 32, 32), "png", ctx.targetDir().resolve(langId + "@2x.png").toFile()); logInfo(" OK", true, false); } catch (final Exception ex) { logInfo(" ERROR [" + ex.getMessage().replace("\n", " | ") + "]", true, false); @@ -184,8 +181,8 @@ void handle() throws IOException { final var grammarOverrides = defaultIfNull(source.inlineGrammars.get(scopeName), Config.InlineGrammarIgnoreable::new); if (!isBlank(grammarOverrides.ignoredReason) && !"false".equals(grammarOverrides.ignoredReason)) { - logInfo("Ignoring inline grammar contribution [" + scopeName + "] as per user config" + ("true".equals( - grammarOverrides.ignoredReason) ? "." : ": " + grammarOverrides.ignoredReason)); + logInfo("Ignoring inline grammar contribution [" + scopeName + "] as per user config" + + ("true".equals(grammarOverrides.ignoredReason) ? "." : ": " + grammarOverrides.ignoredReason)); continue; } final var grammarCfg = inlineGrammar.getValue(); @@ -197,10 +194,10 @@ void handle() throws IOException { } BufferedImage resizeImage(final BufferedImage originalImage, final int targetWidth, final int targetHeight) { - final BufferedImage resizedImage = new BufferedImage(targetWidth, targetHeight, Transparency.TRANSLUCENT); + final var resizedImage = new BufferedImage(targetWidth, targetHeight, BufferedImage.TYPE_INT_ARGB); final Graphics2D g2d = resizedImage.createGraphics(); - // Use RenderingHints to improve image quality + // use RenderingHints to improve image quality g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); g2d.drawImage(originalImage, 0, 0, targetWidth, targetHeight, null); g2d.dispose(); From 0565d40f0a6fa8d39acba29404a35e2e5c65c812 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 12:06:11 +0100 Subject: [PATCH 05/12] refact: rename icon files --- org.eclipse.tm4e.language_pack/README.md | 8 ++++---- org.eclipse.tm4e.language_pack/about.html | 8 ++++---- org.eclipse.tm4e.language_pack/plugin.xml | 8 ++++---- .../syntaxes/bat/{bat.png => bat.icon.png} | Bin .../bat/{bat@2x.png => bat.icon@2x.png} | Bin .../clojure/{clojure.png => clojure.icon.png} | Bin .../{clojure@2x.png => clojure.icon@2x.png} | Bin ...{coffeescript.png => coffeescript.icon.png} | Bin ...escript@2x.png => coffeescript.icon@2x.png} | Bin .../syntaxes/rust/{rust.png => rust.icon.png} | Bin .../rust/{rust@2x.png => rust.icon@2x.png} | Bin .../updater/src/main/java/updater/Updater.java | 17 +++++++++++------ 12 files changed, 23 insertions(+), 18 deletions(-) rename org.eclipse.tm4e.language_pack/syntaxes/bat/{bat.png => bat.icon.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/bat/{bat@2x.png => bat.icon@2x.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/clojure/{clojure.png => clojure.icon.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/clojure/{clojure@2x.png => clojure.icon@2x.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/coffeescript/{coffeescript.png => coffeescript.icon.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/coffeescript/{coffeescript@2x.png => coffeescript.icon@2x.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/rust/{rust.png => rust.icon.png} (100%) rename org.eclipse.tm4e.language_pack/syntaxes/rust/{rust@2x.png => rust.icon@2x.png} (100%) diff --git a/org.eclipse.tm4e.language_pack/README.md b/org.eclipse.tm4e.language_pack/README.md index bdbc97933..e6ec853ef 100644 --- a/org.eclipse.tm4e.language_pack/README.md +++ b/org.eclipse.tm4e.language_pack/README.md @@ -23,14 +23,14 @@ for the [Eclipse IDE](https://eclipseide.org). | Language/Format | File Associations | Source |:--------------- |:----------------- |:------ | | ASP.NET Razor | file-extensions="cshtml, razor" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/razor) [[upstream]](https://github.com/dotnet/razor/commit/b44d0a906d054d2d343adc3f58cbea11d97d7488) -| Batch File | file-extensions="bat, cmd" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/bat) [[upstream]](https://github.com/mmims/language-batchfile/commit/6154ae25a24e01ac9329e7bcf958e093cd8733a9) +| Batch File | file-extensions="bat, cmd" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/bat) [[upstream]](https://github.com/mmims/language-batchfile/commit/6154ae25a24e01ac9329e7bcf958e093cd8733a9) | BibTeX | file-extensions="bib" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/latex) [[upstream]](https://github.com/jlelong/vscode-latex-basics/commit/36411b38cf4ed18e02050249e2162b1316488686) | C | file-extensions="c, i" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/cpp) [[upstream]](https://github.com/jeff-hykin/better-c-syntax/commit/34712a6106a4ffb0a04d2fa836fd28ff6c5849a4) | C# | file-extensions="cake, cs, csx" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/csharp) [[upstream]](https://github.com/dotnet/csharp-tmLanguage/commit/6666eb1d5e6fb565a4110d6db645cc534fb3c6d2) | C++ | file-extensions="c++, cc, cpp, cxx, h, h++, h.in, hh, hpp, hpp.in, hxx, ii, inl, ino, ipp, ixx, tpp, txx" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/cpp) [[upstream]](https://github.com/jeff-hykin/better-cpp-syntax/commit/f1d127a8af2b184db570345f0bb179503c47fdf6) -| Clojure | file-extensions="clj, cljc, cljs, cljx, clojure, edn" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/clojure) [[upstream]](https://github.com/atom/language-clojure/commit/45bdb881501d0b8f8b707ca1d3fcc8b4b99fca03) +| Clojure | file-extensions="clj, cljc, cljs, cljx, clojure, edn" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/clojure) [[upstream]](https://github.com/atom/language-clojure/commit/45bdb881501d0b8f8b707ca1d3fcc8b4b99fca03) | Code Snippets | file-extensions="code-snippets"
file-patterns="\*\*/User/profiles/\*/snippets/\*.json, \*\*/User/snippets/\*.json" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/json) [[upstream]](https://github.com/jeff-hykin/better-snippet-syntax/commit/2b1bb124cb2b9c75c3c80eae1b8f3a043841d654) -| CoffeeScript | file-extensions="coffee, cson, iced" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/coffeescript) [[upstream]](https://github.com/atom/language-coffee-script/commit/0f6db9143663e18b1ad00667820f46747dba495e) +| CoffeeScript | file-extensions="coffee, cson, iced" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/coffeescript) [[upstream]](https://github.com/atom/language-coffee-script/commit/0f6db9143663e18b1ad00667820f46747dba495e) | CSS | file-extensions="css" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/css) [[upstream]](https://github.com/microsoft/vscode-css/commit/c216f777497265700ff336f739328e5197e012cd) | CUDA C++ | file-extensions="cu, cuh" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/cpp) [[upstream]](https://github.com/NVIDIA/cuda-cpp-grammar/commit/81e88eaec5170aa8585736c63627c73e3589998c) | Dart | file-extensions="dart" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/dart) [[upstream]](https://github.com/dart-lang/dart-syntax-highlight/commit/bd0079ba7ca85cdd6400a8a467e532b539d0f285) @@ -68,7 +68,7 @@ for the [Eclipse IDE](https://eclipseide.org). | Raku (Perl 6) | file-extensions="nqp, p6, pl6, pm6, raku, rakudoc, rakumod, rakutest" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/perl) [[upstream]](https://github.com/textmate/perl.tmbundle/commit/d9841a0878239fa43f88c640f8d458590f97e8f5) | reStructuredText | file-extensions="rst" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/restructuredtext) [[upstream]](https://github.com/trond-snekvik/vscode-rst/commit/7f2d6bb4e20642b60f2979afcb594cfe4b48117a) | Ruby | file-extensions="erb, gemspec, podspec, rake, rb, rbi, rbx, rjs, ru"
file-names="appfile, appraisals, berksfile, berksfile.lock, brewfile, capfile, cheffile, dangerfile, deliverfile, fastfile, gemfile, guardfile, gymfile, hobofile, matchfile, podfile, puppetfile, rakefile, rantfile, scanfile, snapfile, thorfile, vagrantfile" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/ruby) [[upstream]](https://github.com/textmate/ruby.tmbundle/commit/efcb8941c701343f1b2e9fb105c678152fea6892) -| Rust | file-extensions="rs" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/rust) [[upstream]](https://github.com/dustypomerleau/rust-syntax/commit/20730dff3c367cb40a7edd278fdaf0239ea50833) +| Rust | file-extensions="rs" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/rust) [[upstream]](https://github.com/dustypomerleau/rust-syntax/commit/20730dff3c367cb40a7edd278fdaf0239ea50833) | SCSS | file-extensions="scss" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/scss) [[upstream]](https://github.com/atom/language-sass/commit/f52ab12f7f9346cc2568129d8c4419bd3d506b47) | ShaderLab | file-extensions="shader" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/shaderlab) [[upstream]](https://github.com/tgjones/shaders-tmLanguage/commit/c72c8b39380ba5a86c58ceed053b5d965ebf38b3) | Shell Script | file-extensions="Xsession, bash, bash_aliases, bash_login, bash_logout, bash_profile, bashrc, csh, cshrc, ebuild, fish, ksh, profile, sh, tcshrc, xprofile, xsession, xsessionrc, yash_profile, yashrc, zlogin, zlogout, zprofile, zsh, zsh-theme, zshenv, zshrc"
file-names=".envrc, .hushlogin, APKBUILD, PKGBUILD, bashrc_Apple_Terminal, zlogin, zlogout, zprofile, zshenv, zshrc, zshrc_Apple_Terminal"
file-patterns=".env.\*" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/shellscript) [[upstream]](https://github.com/jeff-hykin/better-shell-syntax/commit/a3de7b32f1537194a83ee848838402fbf4b67424) diff --git a/org.eclipse.tm4e.language_pack/about.html b/org.eclipse.tm4e.language_pack/about.html index f5a5f5383..417c4a50e 100644 --- a/org.eclipse.tm4e.language_pack/about.html +++ b/org.eclipse.tm4e.language_pack/about.html @@ -43,7 +43,7 @@

About This Content

1.85.2@microsoft/vscode [upstream] - Batch File + Batch File file-extensions="bat, cmd" 1.85.2@microsoft/vscode [upstream] @@ -68,7 +68,7 @@

About This Content

1.85.2@microsoft/vscode [upstream] - Clojure + Clojure file-extensions="clj, cljc, cljs, cljx, clojure, edn" 1.85.2@microsoft/vscode [upstream] @@ -78,7 +78,7 @@

About This Content

1.85.2@microsoft/vscode [upstream] - CoffeeScript + CoffeeScript file-extensions="coffee, cson, iced" 1.85.2@microsoft/vscode [upstream] @@ -268,7 +268,7 @@

About This Content

1.85.2@microsoft/vscode [upstream] - Rust + Rust file-extensions="rs" 1.85.2@microsoft/vscode [upstream] diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml index 722b220ec..195416a0a 100644 --- a/org.eclipse.tm4e.language_pack/plugin.xml +++ b/org.eclipse.tm4e.language_pack/plugin.xml @@ -88,7 +88,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -1132,7 +1132,7 @@ - + diff --git a/org.eclipse.tm4e.language_pack/syntaxes/bat/bat.png b/org.eclipse.tm4e.language_pack/syntaxes/bat/bat.icon.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/bat/bat.png rename to org.eclipse.tm4e.language_pack/syntaxes/bat/bat.icon.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/bat/bat@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/bat/bat.icon@2x.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/bat/bat@2x.png rename to org.eclipse.tm4e.language_pack/syntaxes/bat/bat.icon@2x.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure.png b/org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure.icon.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure.png rename to org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure.icon.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure.icon@2x.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure@2x.png rename to org.eclipse.tm4e.language_pack/syntaxes/clojure/clojure.icon@2x.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript.png b/org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript.icon.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript.png rename to org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript.icon.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript.icon@2x.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript@2x.png rename to org.eclipse.tm4e.language_pack/syntaxes/coffeescript/coffeescript.icon@2x.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.png b/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.icon.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/rust/rust.png rename to org.eclipse.tm4e.language_pack/syntaxes/rust/rust.icon.png diff --git a/org.eclipse.tm4e.language_pack/syntaxes/rust/rust@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/rust/rust.icon@2x.png similarity index 100% rename from org.eclipse.tm4e.language_pack/syntaxes/rust/rust@2x.png rename to org.eclipse.tm4e.language_pack/syntaxes/rust/rust.icon@2x.png diff --git a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java index 03675f56a..f6d04da71 100644 --- a/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java +++ b/org.eclipse.tm4e.language_pack/updater/src/main/java/updater/Updater.java @@ -279,6 +279,14 @@ public void run(final String sourceId) throws Exception { logHeader("** DONE **"); } + private String getIconFileName(final Path syntaxDir, final String langId) { + return Files.exists(syntaxDir.resolve(langId + ".icon.png")) + ? langId + ".icon.png" + : Files.exists(syntaxDir.resolve("icon.png")) + ? "icon.png" + : null; + } + private void updateAboutHTML() throws IOException { logHeader("Updating [about.html.]..."); @@ -295,8 +303,7 @@ private void updateAboutHTML() throws IOException { } final var syntaxDir = syntaxesDir.resolve(extId); - final var iconFileName = Files.exists(syntaxDir.resolve(langId + ".png")) ? langId + ".png" - : Files.exists(syntaxDir.resolve("icon.png")) ? "icon.png" : null; + final var iconFileName = getIconFileName(syntaxDir, langId); final var templateVars = new HashMap(); @@ -357,8 +364,7 @@ private void updatePluginXML() throws IOException { final var grammarFile = findFirstFile(syntaxDir, // f -> f.matches(Pattern.quote(langId) + "[.]tmLanguage[.](yaml|json|plist)")); - final var iconFileName = Files.exists(syntaxDir.resolve(langId + ".png")) ? langId + ".png" - : Files.exists(syntaxDir.resolve("icon.png")) ? "icon.png" : null; + final var iconFileName = getIconFileName(syntaxDir, langId); final var exampleFile = findFirstFile(syntaxDir, // f -> f.matches(Pattern.quote(langId) + "[.]example[.].*")); @@ -509,8 +515,7 @@ private void updateReadmeMD() throws IOException { } final var syntaxDir = syntaxesDir.resolve(extId); - final var iconFileName = Files.exists(syntaxDir.resolve(langId + ".png")) ? langId + ".png" - : Files.exists(syntaxDir.resolve("icon.png")) ? "icon.png" : null; + final var iconFileName = getIconFileName(syntaxDir, langId); final var templateVars = new HashMap(); From 9751c79bbd7c6309746ce93376e5d4f1c8844dd0 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 12:20:57 +0100 Subject: [PATCH 06/12] feat: add icons for java,md,xml,xsl files --- org.eclipse.tm4e.language_pack/README.md | 8 +++--- org.eclipse.tm4e.language_pack/about.html | 8 +++--- org.eclipse.tm4e.language_pack/plugin.xml | 16 ++++++++++++ .../syntaxes/java/java.icon.md | 10 ++++++++ .../syntaxes/java/java.icon.png | Bin 0 -> 442 bytes .../syntaxes/java/java.icon.svg | 23 ++++++++++++++++++ .../syntaxes/java/java.icon@2x.png | Bin 0 -> 903 bytes .../syntaxes/markdown/icon.png | Bin 0 -> 176 bytes .../syntaxes/markdown/icon@2x.png | Bin 0 -> 323 bytes .../syntaxes/xml/icon.md | 6 +++++ .../syntaxes/xml/icon.png | Bin 0 -> 421 bytes .../syntaxes/xml/icon@2x.png | Bin 0 -> 799 bytes 12 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.md create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.png create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.svg create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/java/java.icon@2x.png create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/markdown/icon.png create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/markdown/icon@2x.png create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/xml/icon.md create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/xml/icon.png create mode 100644 org.eclipse.tm4e.language_pack/syntaxes/xml/icon@2x.png diff --git a/org.eclipse.tm4e.language_pack/README.md b/org.eclipse.tm4e.language_pack/README.md index e6ec853ef..7551f19d2 100644 --- a/org.eclipse.tm4e.language_pack/README.md +++ b/org.eclipse.tm4e.language_pack/README.md @@ -45,7 +45,7 @@ for the [Eclipse IDE](https://eclipseide.org). | HLSL (High-Level Shader Language) | file-extensions="cginc, compute, fx, fxh, hlsl, hlsli, psh, vsh" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/hlsl) [[upstream]](https://github.com/tgjones/shaders-tmLanguage/commit/87c0dca3a39170dbd7ee7e277db4f915fb2de14a) | HTML | file-extensions="asp, aspx, ejs, htm, html, jshtm, jsp, mdoc, rhtml, shtml, volt, xht, xhtml" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/html) [[upstream]](https://github.com/textmate/html.tmbundle/commit/390c8870273a2ae80244dae6db6ba064a802f407) | INI Config File | file-extensions="ini" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/ini) [[upstream]](https://github.com/textmate/ini.tmbundle/commit/2af0cbb0704940f967152616f2f1ff0aae6287a6) -| Java | file-extensions="jav, java" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/java) [[upstream]](https://github.com/redhat-developer/vscode-java/commit/5d224a552cf5f0f8ebccf69e43e2575ed2c13839) +| Java | file-extensions="jav, java" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/java) [[upstream]](https://github.com/redhat-developer/vscode-java/commit/5d224a552cf5f0f8ebccf69e43e2575ed2c13839) | JavaScript | file-extensions="cjs, es6, js, mjs, pac"
file-names="jakefile" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/javascript) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747) | JavaScript JSX | file-extensions="jsx" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/javascript) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747) | JSON | file-extensions="bowerrc, css.map, geojson, har, ipynb, js.map, jscsrc, jslintrc, json, jsonld, ts.map, vuerc, webmanifest"
file-names=".watchmanconfig, composer.lock" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/json) [[upstream]](https://github.com/microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70) @@ -56,7 +56,7 @@ for the [Eclipse IDE](https://eclipseide.org). | Less | file-extensions="less" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/less) [[upstream]](https://github.com/atom/language-less/commit/87d4d59e8de6796b506b81a16e1dc1fafc99d30f) | Lua | file-extensions="lua" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/lua) [[upstream]](https://github.com/sumneko/lua.tmbundle/commit/3a18700941737c3ab66ac5964696f141aee61800) | Makefile | file-extensions="mak, mk"
file-names="GNUmakefile, Makefile, OCamlMakefile, makefile" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/make) [[upstream]](https://github.com/fadeevab/make.tmbundle/commit/1d4c0b541959995db098df751ffc129da39a294b) -| Markdown | file-extensions="markdn, markdown, md, mdown, mdtext, mdtxt, mdwn, mkd, workbook" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/markdown-basics) [[upstream]](https://github.com/microsoft/vscode-markdown-tm-grammar/commit/0a4b23580308fdcfb4ab7b526e3e13ba17d436fb) +| Markdown | file-extensions="markdn, markdown, md, mdown, mdtext, mdtxt, mdwn, mkd, workbook" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/markdown-basics) [[upstream]](https://github.com/microsoft/vscode-markdown-tm-grammar/commit/0a4b23580308fdcfb4ab7b526e3e13ba17d436fb) | Objective-C | file-extensions="m" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/objective-c) [[upstream]](https://github.com/jeff-hykin/better-objc-syntax/commit/119b75fb1f4d3e8726fa62588e3b935e0b719294) | Objective-C++ | file-extensions="mm" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/objective-c) [[upstream]](https://github.com/jeff-hykin/better-objcpp-syntax/commit/5a7eb15eee382dd5aa388bc04fdb60a0d2128e14) | Perl | file-extensions="PL, pl, pm, pod, psgi, t" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/perl) [[upstream]](https://github.com/textmate/perl.tmbundle/commit/a85927a902d6e5d7805f56a653f324d34dfad53a) @@ -79,8 +79,8 @@ for the [Eclipse IDE](https://eclipseide.org). | TypeScript JSX | file-extensions="tsx" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/typescript-basics) [[upstream]](https://github.com/microsoft/TypeScript-TmLanguage/commit/8c7482b94b548eab56da64dbfb30b82589b3f747) | Visual Basic | file-extensions="bas, brs, vb, vba, vbs" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/vb) [[upstream]](https://github.com/textmate/asp.vb.net.tmbundle/commit/72d44550b3286d0382d7be0624140cf97857ff69) | VS Code Search Result | file-extensions="code-search" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/search-result) -| XML | file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/7bc75dfe779ad5b35d9bf4013d9181864358cb49) -| XSL | file-extensions="xsl, xslt" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280) +| XML | file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/7bc75dfe779ad5b35d9bf4013d9181864358cb49) +| XSL | file-extensions="xsl, xslt" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/xml) [[upstream]](https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280) | YAML | file-extensions="cff, eyaml, eyml, yaml, yaml-tmlanguage, yaml-tmpreferences, yaml-tmtheme, yml" | [1.85.2@microsoft/vscode](https://github.com/microsoft/vscode/tree/8b3775030ed1a69b13e4f4c628c612102e30a681/extensions/yaml) [[upstream]](https://github.com/textmate/yaml.tmbundle/commit/e54ceae3b719506dba7e481a77cea4a8b576ae46) diff --git a/org.eclipse.tm4e.language_pack/about.html b/org.eclipse.tm4e.language_pack/about.html index 417c4a50e..b6d99b2e2 100644 --- a/org.eclipse.tm4e.language_pack/about.html +++ b/org.eclipse.tm4e.language_pack/about.html @@ -153,7 +153,7 @@

About This Content

1.85.2@microsoft/vscode [upstream] - Java + Java file-extensions="jav, java" 1.85.2@microsoft/vscode [upstream] @@ -208,7 +208,7 @@

About This Content

1.85.2@microsoft/vscode [upstream] - Markdown + Markdown file-extensions="markdn, markdown, md, mdown, mdtext, mdtxt, mdwn, mkd, workbook" 1.85.2@microsoft/vscode [upstream] @@ -323,12 +323,12 @@

About This Content

1.85.2@microsoft/vscode - XML + XML file-extensions="ascx, atom, axaml, axml, bpmn, cpt, csl, csproj, csproj.user, dita, ditamap, dtd, dtml, ent, fsproj, fxml, iml, isml, jmx, launch, menu, mod, mxml, nuspec, opml, owl, proj, props, pt, publishsettings, pubxml, pubxml.user, rbxlx, rbxmx, rdf, rng, rss, shproj, storyboard, svg, targets, tld, tmx, vbproj, vbproj.user, vcxproj, vcxproj.filters, wsdl, wxi, wxl, wxs, xaml, xbl, xib, xlf, xliff, xml, xoml, xpdl, xsd, xul" 1.85.2@microsoft/vscode [upstream] - XSL + XSL file-extensions="xsl, xslt" 1.85.2@microsoft/vscode [upstream] diff --git a/org.eclipse.tm4e.language_pack/plugin.xml b/org.eclipse.tm4e.language_pack/plugin.xml index 195416a0a..f0b685bdf 100644 --- a/org.eclipse.tm4e.language_pack/plugin.xml +++ b/org.eclipse.tm4e.language_pack/plugin.xml @@ -525,6 +525,10 @@ + + + + @@ -836,6 +840,10 @@ + + + + @@ -1350,6 +1358,10 @@ + + + + @@ -1370,6 +1382,10 @@ + + + + diff --git a/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.md b/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.md new file mode 100644 index 000000000..884ea946a --- /dev/null +++ b/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.md @@ -0,0 +1,10 @@ + +file|source +----|------ +[java.icon.svg](java.icon.svg) | https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/jcu_resource_obj.svg +[java.icon.png](java.icon.png) | https://github.com/eclipse-jdt/eclipse.jdt.ui/blob/master/org.eclipse.jdt.ui/icons/full/obj16/jcu_resource_obj.png +[java.icon@2x.png](java.icon.png) | https://github.com/eclipse-jdt/eclipse.jdt.ui/blob/master/org.eclipse.jdt.ui/icons/full/obj16/jcu_resource_obj@2x.png + +See also at https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Freference%2Fref-icons.htm: +- ![](https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/jcu_resource_obj.svg) → Java file which is not on a build path see +- ![](https://help.eclipse.org/latest/topic/org.eclipse.jdt.doc.user/images/org.eclipse.jdt.ui/obj16/jcu_obj.svg) → Compilation unit (*.java file) diff --git a/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.png b/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d668c60933a646cad0fdfd0d1ef9bf03a002593a GIT binary patch literal 442 zcmV;r0Y(0aP)cWf2tADl9_8k_s&)T1Xfcg%P1;Z=+R4xXD^16%m$M z6qcrGi8iC~%R4aQz%5#M;V{GZoqJ|AB2hWd?sN@)!!sjK@0-Qde+IUuBw*M)m2;OG zJ7xv5X_BgV9}rat0_(ESO#oJM7i8dw>Z;WLvHKrUZ}<7gRj6lcVv29^wRB-1$o#el|9oDq*2SQu3x{>2I? z4e&GKQ3E!;60sD^aruzoo_wIW5a4&jqXw+HI=m%W=$21V)nkL(7Ze1@jzBzWU{+g? zNP>a5cOG`n1!Vn;=rC;Hz#rlQWJe$#HDDQOz;m2Ir*Rvu;~PZc8AOv=3|J4*W!d9) z1maNxrr}0B#lGPUyr5n0;=U^Bv!ku>9teGKI|A{jfeDQY;pjKV{c8rNx9_-qOciH5 k#G?kr2Al9-%Jv8U0Dw!)o(7$)Qvd(}07*qoM6N<$f-VfY5&!@I literal 0 HcmV?d00001 diff --git a/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.svg b/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.svg new file mode 100644 index 000000000..234024566 --- /dev/null +++ b/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/java/java.icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4fe4ac42f4aa8c45ff526b9aea09fd6a1043ae62 GIT binary patch literal 903 zcmV;219<$2P)7M2Sqrj535taPAxeO#2r)_k zFN{Gz1lbfsmO@zs+L9dS96Mt>+R4`dcTDnJOnTn;Jn77|88^3s!^!bn>j}GHvPJEA zbXNk;xT0OMJBgMoFF?$e9hVqxkA)6hDA@9oO)4Mv|Mdg79g-Ai)_4K3ZQgN-(atoI zXfFr_TgOUMmY1)~-$0|<8;~uo)D^yVXK)g!@EIkF!l|QC6A0tMCP6^_Nu=X9D86rh*9SV;0cg_XEVVVU@(0fOxJUKa%>G z1*+wKfUK-rC2=Moo~zG|q&{YW%6rEFF|J!A@w!$)3ul%#90bI3Pjk*uAG1I?H;gQ; zStL1`P)iF3r;H8);<-9b0Q*W<1xhpg0a;wNND}5mKs;BQ9YuZ20>yXz0a-9v92l5b zhJ^Ch&_6Oy=gtJgxtfPj)WBfjzPuDhf&8>UK<1XsgvXUKDo(BHhO_AgLE_lu zQW9G*Z8-?=Ii8BFXzF7Y$W09dWY%aV&ZN{)aohWG=o|h4kr@qi?s2sYN?JeA@;T$C zAi(E%$~4i`$1ISY5(LN$7e-WuUMjw>>kxi)#%4^y^N*ky&fsO?b37&L3)IIfpiK@2 z>qolg z;=f>f{BKr4-^hYP4k=X1sE=7dl^6oZ^uo3S)h~vG8`7RriBBM@q8kRLR{zN$1(`DH zQ>TQn2`Cdn0GZ;#dqJK;Mt#fziueWnJ6Zk%P45NTNjvL+&SOqd-LnrqG`K_=c d2QR+%$8U4EN1Nq>pcMcB002ovPDHLkV1h9soIwBp literal 0 HcmV?d00001 diff --git a/org.eclipse.tm4e.language_pack/syntaxes/markdown/icon.png b/org.eclipse.tm4e.language_pack/syntaxes/markdown/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e63a40090e0d80726e254cb014de44add1959dcb GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`<(@8%Ar*1S2@+-x>}N{wNd244 z=};BO6R|5ta+A%B|G&;=i~Q@Cw|`K>!yIwb@_@w5+DA`3cd!ZkKResJz|N0(M&!*C z<_vS&BpHkaT9*6H=My`ed7!zS|6xsuxP+AS;hz$00$eU74T%gZ8PXUy7N`p(eJo&L ZIC^NdweQSDM}SUX@O1TaS?83{1ONj1JH-G1 literal 0 HcmV?d00001 diff --git a/org.eclipse.tm4e.language_pack/syntaxes/markdown/icon@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/markdown/icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..883566ccce92a18da44a7af2949efc2b3ed07a5a GIT binary patch literal 323 zcmV-J0lfZ+P)tE7nqiiNK&Id4u+~+(QBd z!_a6nE#dSmQgb1bLp;wTb%Csx#9JT;0&(5nKvug2rt<|cEt}TP_j6k_Zc)Vh*egTT zFBNc>F6s6MyzX(F+fF`uvH+m!R~A4qa95287#-^?yeI&u`jrIMo2?|&R0aT5zmfnz zpN;KapU%kwCbJp4uppexUBi&Bt1JKzjB%1AbSx7{)0D3hYkxTMbw3Fp_HDa!g;#K+tPMg|Ab2i)ir})Z)UoBLq1EJ;HfRC|BxK;x`OlueG=jXy89L)u;i_ z={|}-HIYH(I!0zUkj;NXKB~gZ8Y}IHM-8~$2Pl+lB6qPQ`lr-LWr|SD>EH_7N;~3F z1I`mOawS1RZ}DQd@e1Y2Uela-)PUV#LH0|Kc!_7wH8c-T_@QY|JZivdx8b88NGvnQ zm{jdzY(bB7o|optqXx`2JJO%L2p5f^cVZQZbP3~&MzGGXv?Crhz*-$h<#-YD0ecin zcuwRXZ`=dZYH3G2YQS{l!h5#b7UEF@hC?@!nQB{zM-6PUXZSB2`-6W05IyaSSR;#K P00000NkvXXu0mjf3DB?v literal 0 HcmV?d00001 diff --git a/org.eclipse.tm4e.language_pack/syntaxes/xml/icon@2x.png b/org.eclipse.tm4e.language_pack/syntaxes/xml/icon@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..96ee03c13e8e306eef53e2f3536ce28a21300905 GIT binary patch literal 799 zcmV+)1K|9LP);}ZU7>r=&fin>pt$RdKLjVyG+`#i_0+MWM(uxtuABt><|p0jDPLuq+u6w@=ljYao0IIojkoN5j*%_l+3V^E|S^gVJO`=Dn&R{1n*q zCoJF;6~kJdM;2%(Ndd&AH5<|K_VbFs)1HqT*77{EKz(rvAahc{5NrSFia=}chYf3a z9$BF7S}Gt;Pr#5vs~$nF_6TO(vSBUHBMa1CO$Edu26XALg{RNfUcl_-m+;w}VZ(Z! zM;53lN&{q8Yu4l7sqplT)*%Kzh3R=&x1Q&b1nio??ZPxbW`w{xUaXpa$|W=SDYU*G z*6rbWGy$hlZQrnVeH%0?#80l%3B6WWp)O1fE9|u)~g$f=u`mkpGPT dy1;*T{RVyK)N`*pP*wl{002ovPDHLkV1gf)e$xN| literal 0 HcmV?d00001 From 603694080e7eb6dd8cc2a0638693bc1c8d7980b0 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 12:56:57 +0100 Subject: [PATCH 07/12] docs: add link to SimRel release info page --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fb4185673..dfc7e1b85 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -127,5 +127,6 @@ GitHub provides additional documentation on [forking a repository](https://help. 1. Create a new `x.y.z` release entry on GitHub, from the `x.y.z` tag. 1. Create a new `x.y.z` release entry on https://projects.eclipse.org/projects/technology.tm4e 1. Create a PR to update https://github.com/eclipse-simrel/simrel.build/blob/main/tm4e.aggrcon + - For SimRel release dates see https://github.com/eclipse-simrel/.github/blob/main/wiki/Simultaneous_Release.md 1. (Optionally) Announce on mailing-lists. social media... 1. Run `python bump-version.py patch` and commit all changed pom.xml/feature.xml/MANIFEST.MF files to `main` branch From 0434b354da5086476c8f5fa36fce93950f108e8f Mon Sep 17 00:00:00 2001 From: Sebastian Thomschke Date: Fri, 16 Feb 2024 21:19:25 +0100 Subject: [PATCH 08/12] docs: add info about Eclipse compatibility --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 7cd89b101..38af3d54d 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,18 @@ You can install TM4E with the update site [https://download.eclipse.org/tm4e/sna [more information coming soon] +### Eclipse IDE compatibility + +TM4E version | Min. Eclipse version +-------------|-------------------- +[latest](https://download.eclipse.org/tm4e/releases/latest/) | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0)) +[0.9.0](https://download.eclipse.org/tm4e/releases/0.9/)+ | [2023-09](https://projects.eclipse.org/releases/2023-09) ([4.29](https://projects.eclipse.org/projects/eclipse/releases/4.29.0)) +[0.8.1](https://download.eclipse.org/tm4e/releases/0.8.1/)+ | [2023-06](https://projects.eclipse.org/releases/2023-06) ([4.28](https://projects.eclipse.org/projects/eclipse/releases/4.28.0)) +[0.8](https://download.eclipse.org/tm4e/releases/0.8/)+ | [2023-03](https://projects.eclipse.org/releases/2023-03) ([4.27](https://projects.eclipse.org/projects/eclipse/releases/4.27.0)) +[0.6.3](https://download.eclipse.org/tm4e/releases/0.6.3/)+ | [2022-12](https://projects.eclipse.org/releases/2022-12) ([4.26](https://projects.eclipse.org/projects/eclipse/releases/4.26.0)) +[0.6.2](https://download.eclipse.org/tm4e/releases/0.6.2/)+ | [2022-09](https://projects.eclipse.org/releases/2022-09) ([4.25](https://projects.eclipse.org/projects/eclipse/releases/4.25.0)) +[0.6.0](https://download.eclipse.org/tm4e/releases/0.6.0/)+ | [2022-03](https://projects.eclipse.org/releases/2022-03) ([4.23](https://projects.eclipse.org/projects/eclipse/releases/4.23.0)) + ## ⌨️ Code From 64c2fa1182ec3c5df46f09b17c83ca55ec7608a2 Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 22:14:24 +0100 Subject: [PATCH 09/12] fix: default theme cannot be set in plugin customization file #713 --- .../main/java/org/eclipse/tm4e/ui/TMUIPlugin.java | 4 ++++ .../ui/internal/preferences/PreferenceHelper.java | 14 +++++++------- .../tm4e/ui/internal/themes/ThemeManager.java | 12 +++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java index 5f39018a8..e01d12d4b 100644 --- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java +++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/TMUIPlugin.java @@ -43,6 +43,10 @@ public class TMUIPlugin extends AbstractUIPlugin { @Nullable private static volatile TMUIPlugin plugin; + public static @Nullable String getPreference(final String key, final @Nullable String defaultValue) { + return Platform.getPreferencesService().getString(PLUGIN_ID, key, defaultValue, null /* = search in all available scopes */); + } + public static void log(final IStatus status) { final var p = plugin; if (p != null) { diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/PreferenceHelper.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/PreferenceHelper.java index 1b71831fb..c1a73a160 100644 --- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/PreferenceHelper.java +++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/PreferenceHelper.java @@ -84,14 +84,14 @@ public static String toJsonThemeAssociations(final Collection } public static Set loadMarkerConfigs() { - final var prefs = InstanceScope.INSTANCE.getNode(TMUIPlugin.PLUGIN_ID); - final var json = prefs.get(PreferenceConstants.TASK_TAGS, null); + final var json = TMUIPlugin.getPreference(PreferenceConstants.TASK_TAGS, null); Set result = null; - try { - result = loadMarkerConfigs(json); - } catch (final JsonSyntaxException ex) { - TMUIPlugin.logError(ex); - } + if (json != null) + try { + result = loadMarkerConfigs(json); + } catch (final JsonSyntaxException ex) { + TMUIPlugin.logError(ex); + } return result == null ? MarkerConfig.getDefaults() : result; } diff --git a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/themes/ThemeManager.java b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/themes/ThemeManager.java index ac8d97935..81f9df134 100644 --- a/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/themes/ThemeManager.java +++ b/org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/themes/ThemeManager.java @@ -120,10 +120,8 @@ private void loadThemesFromExtensionPoints() { * Load TextMate Themes from preferences. */ private void loadThemesFromPreferences() { - // Load Theme definitions from the - // "${workspace_loc}/metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.tm4e.ui.prefs" - final var prefs = InstanceScope.INSTANCE.getNode(TMUIPlugin.PLUGIN_ID); - String json = prefs.get(PreferenceConstants.THEMES, null); + // Load Theme definitions from preferences + String json = TMUIPlugin.getPreference(PreferenceConstants.THEMES, null); if (json != null) { for (final var jsonElem : new Gson().fromJson(json, JsonObject[].class)) { final String name = jsonElem.get("id").getAsString(); @@ -134,7 +132,7 @@ private void loadThemesFromPreferences() { } } - json = prefs.get(PreferenceConstants.THEME_ASSOCIATIONS, null); + json = TMUIPlugin.getPreference(PreferenceConstants.THEME_ASSOCIATIONS, null); if (json != null) { final var themeAssociations = PreferenceHelper.loadThemeAssociations(json); for (final IThemeAssociation association : themeAssociations) { @@ -142,8 +140,8 @@ private void loadThemesFromPreferences() { } } - defaultDarkThemeId = prefs.get(PreferenceConstants.DEFAULT_DARK_THEME, null); - defaultLightThemeId = prefs.get(PreferenceConstants.DEFAULT_LIGHT_THEME, null); + defaultDarkThemeId = TMUIPlugin.getPreference(PreferenceConstants.DEFAULT_DARK_THEME, null); + defaultLightThemeId = TMUIPlugin.getPreference(PreferenceConstants.DEFAULT_LIGHT_THEME, null); } void save() throws BackingStoreException { From 61c212831b04d915f662fc99fe4631ee07139bda Mon Sep 17 00:00:00 2001 From: sebthom Date: Fri, 16 Feb 2024 20:28:49 +0100 Subject: [PATCH 10/12] ci: test against minimum supported and current stable Eclipse release --- .github/workflows/build.yml | 24 ++++++++++- .github/workflows/licensecheck.yml | 19 +++++++-- pom.xml | 8 +--- target-platform/pom.xml | 14 ------- target-platforms/latest.target | 40 +++++++++++++++++++ .../oldest.target | 36 +++++------------ target-platforms/unstable.target | 40 +++++++++++++++++++ 7 files changed, 131 insertions(+), 50 deletions(-) delete mode 100644 target-platform/pom.xml create mode 100644 target-platforms/latest.target rename target-platform/tm4e-target.target => target-platforms/oldest.target (64%) create mode 100644 target-platforms/unstable.target diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18208461a..10cf96fd6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,11 @@ jobs: - ubuntu-latest - macos-11 # macos-latest -> more macos-11 runners than macos-12 available - windows-latest + target-platform: + - oldest + - latest + - unstable + runs-on: ${{ matrix.os }} timeout-minutes: 15 @@ -99,10 +104,23 @@ jobs: - name: "Cache: Local Maven Repository" uses: actions/cache@v4 with: + # Excluded sub directory not working https://github.com/actions/cache/issues/494#issuecomment-948783891 path: | - ~/.m2/repository + ~/.m2/repository/* + !~/.m2/repository/.cache/tycho + !~/.m2/repository/.meta/p2-artifacts.properties + !~/.m2/repository/p2 !~/.m2/repository/*SNAPSHOT* - key: ${{ runner.os }}-mvnrepo-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('**/target-platform/tm4e-target.target') }} + key: ${{ runner.os }}-repo-mvn-${{ hashFiles('**/pom.xml') }} + + - name: "Cache: Local Tycho Repository" + uses: actions/cache@v4 + with: + path: | + ~/.m2/repository/.cache/tycho + ~/.m2/repository/.meta/p2-artifacts.properties + ~/.m2/repository/p2 + key: ${{ runner.os }}-repo-tycho-${{ hashFiles(format('target-platforms/{0}.target', matrix.target-platform)) }} - name: "Install: Maven" uses: stCarolas/setup-maven@v4.5 # https://github.com/stCarolas/setup-maven @@ -111,6 +129,7 @@ jobs: - name: Build with Maven id: maven-build + continue-on-error: ${{ matrix.target-platform == 'unstable' }} run: | set -eu @@ -139,6 +158,7 @@ jobs: --show-version \ -Dtycho.disableP2Mirrors=true \ -Dsurefire.rerunFailingTestsCount=3 \ + -Dtm4e.target-platform=${{ matrix.target-platform }} \ $maven_args \ ${{ github.event.inputs.additional_maven_args }} \ clean verify diff --git a/.github/workflows/licensecheck.yml b/.github/workflows/licensecheck.yml index 85345550f..f02ae6cbc 100644 --- a/.github/workflows/licensecheck.yml +++ b/.github/workflows/licensecheck.yml @@ -44,10 +44,23 @@ jobs: - name: "Cache: Local Maven Repository" uses: actions/cache@v4 with: + # Excluded sub directory not working https://github.com/actions/cache/issues/494#issuecomment-948783891 path: | - ~/.m2/repository - !~/.m2/**/*SNAPSHOT* - key: ${{ runner.os }}-mvnrepo-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('**/target-platform/tm4e-target.target') }} + ~/.m2/repository/* + !~/.m2/repository/.cache/tycho + !~/.m2/repository/.meta/p2-artifacts.properties + !~/.m2/repository/p2 + !~/.m2/repository/*SNAPSHOT* + key: ${{ runner.os }}-repo-mvn-${{ hashFiles('**/pom.xml') }} + + - name: "Cache: Local Tycho Repository" + uses: actions/cache@v4 + with: + path: | + ~/.m2/repository/.cache/tycho + ~/.m2/repository/.meta/p2-artifacts.properties + ~/.m2/repository/p2 + key: ${{ runner.os }}-repo-tycho-${{ hashFiles('target-platforms/oldest.target') }} - name: "Install: Maven" uses: stCarolas/setup-maven@v4.5 # https://github.com/stCarolas/setup-maven diff --git a/pom.xml b/pom.xml index c55022308..bfde5dad3 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ scm:git:https://github.com/eclipse/tm4e.git error + oldest Eclipse TM4E project @@ -34,7 +35,6 @@ - target-platform org.eclipse.tm4e.core org.eclipse.tm4e.core.tests org.eclipse.tm4e.registry @@ -83,11 +83,7 @@ consider - - org.eclipse.tm4e - tm4e-target - 0.10.1-SNAPSHOT - + ${maven.multiModuleProjectDirectory}/target-platforms/${tm4e.target-platform}.target diff --git a/target-platform/pom.xml b/target-platform/pom.xml deleted file mode 100644 index 323e3ef57..000000000 --- a/target-platform/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - org.eclipse - org.eclipse.tm4e - 0.10.1-SNAPSHOT - - - org.eclipse.tm4e - tm4e-target - eclipse-target-definition - \ No newline at end of file diff --git a/target-platforms/latest.target b/target-platforms/latest.target new file mode 100644 index 000000000..258f458ed --- /dev/null +++ b/target-platforms/latest.target @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target-platform/tm4e-target.target b/target-platforms/oldest.target similarity index 64% rename from target-platform/tm4e-target.target rename to target-platforms/oldest.target index e59e6adee..2485a04ff 100644 --- a/target-platform/tm4e-target.target +++ b/target-platforms/oldest.target @@ -1,6 +1,6 @@ - + @@ -8,9 +8,16 @@ + + - - + + + + + + + @@ -22,7 +29,6 @@ - @@ -36,27 +42,7 @@ - - - - - org.jruby.joni - joni - 2.2.1 - jar - - - - - + \ No newline at end of file diff --git a/target-platforms/unstable.target b/target-platforms/unstable.target new file mode 100644 index 000000000..75e847eeb --- /dev/null +++ b/target-platforms/unstable.target @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 937a597eb46ca436fdbaeb9cdd8f3fbe5906c50c Mon Sep 17 00:00:00 2001 From: sebthom Date: Sun, 18 Feb 2024 22:50:03 +0100 Subject: [PATCH 11/12] build: update maven project config --- Jenkinsfile | 3 +- pom.xml | 216 +++++++++++++++++++++++++++------------------------- 2 files changed, 113 insertions(+), 106 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ad27158fc..f0b65ebc4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,8 @@ pipeline { } stage('Build') { steps { - withMaven(maven:'apache-maven-latest', mavenLocalRepo: '$WORKSPACE/.m2/repository') { + // https://wiki.eclipse.org/Jenkins#Apache_Maven + withMaven(maven:'apache-maven-3.9.5', mavenLocalRepo: '$WORKSPACE/.m2/repository') { withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) { wrap([$class: 'Xvnc', useXauthority: true]) { sh '''mvn clean verify \ diff --git a/pom.xml b/pom.xml index bfde5dad3..f47e8f6b9 100644 --- a/pom.xml +++ b/pom.xml @@ -8,17 +8,14 @@ 0.10.1-SNAPSHOT pom - - 3.9.6 - - UTF-8 4.0.5 ../target/jacoco.exec scm:git:https://github.com/eclipse/tm4e.git + error - + 3.9.5 oldest @@ -34,6 +31,7 @@ repo + org.eclipse.tm4e.core org.eclipse.tm4e.core.tests @@ -49,26 +47,41 @@ org.eclipse.tm4e.language_pack.feature org.eclipse.tm4e.repository + + + https://github.com/eclipse/tm4e + scm:git:https://github.com/eclipse/tm4e + scm:git:https://github.com/eclipse/tm4e + + - clean install + clean verify + src/test/java - - - - org.eclipse.tycho - tycho-surefire-plugin - ${tycho-version} - - - true - true - -Xms512m -Xmx512m ${tycho-surefire-plugin.platformArgs} - - - - + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + enforce + + enforce + + + true + + + ${maven-enforcer-rule.version} + + + + + + org.eclipse.tycho tycho-maven-plugin @@ -79,12 +92,27 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - true - consider ${maven.multiModuleProjectDirectory}/target-platforms/${tm4e.target-platform}.target + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + macosx + cocoa + x86_64 + + @@ -167,7 +195,7 @@ - http://download.eclipse.org/tm4e/snapshots + https://download.eclipse.org/tm4e/snapshots false @@ -177,6 +205,14 @@ org.eclipse.tycho tycho-packaging-plugin ${tycho-version} + + + true + + jgit + pom.xml + ${jgit.dirtyWorkingTree} + org.eclipse.tycho @@ -189,41 +225,25 @@ ${tycho-version} - - - true - - jgit - pom.xml - ${jgit.dirtyWorkingTree} - - - - com.mycila.maven-license-plugin - maven-license-plugin - 1.9.0 - - ${basedir} -
license.txt
- - src/**/*.java - - - maven-release-plugin - - true - lax - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.6.3 - - true - + org.eclipse.tycho.extras + tycho-p2-extras-plugin + ${tycho-version} + + + + compare-version-with-baseline + + compare-version-with-baselines + + + + https://download.eclipse.org/tm4e/releases/latest + + + + org.jacoco @@ -242,35 +262,35 @@ - - org.eclipse.tycho.extras - tycho-p2-extras-plugin - ${tycho-version} - - - compare-version-with-baseline - - compare-version-with-baselines - - - - http://download.eclipse.org/tm4e/releases/latest - - - - - + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + + true + true + -Xms512m -Xmx512m ${tycho-surefire-plugin.vmargs} + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.6.3 + + true + + + + - - https://github.com/eclipse/tm4e - scm:git:https://github.com/eclipse/tm4e - scm:git:https://github.com/eclipse/tm4e - - + local-dev @@ -281,21 +301,6 @@ warning - - lax - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho-version} - - false - - - - - sign @@ -306,7 +311,7 @@ 1.4.3 - jarsigner + sign-jars package sign @@ -317,15 +322,16 @@ + - macosx + macos mac - -XstartOnFirstThread + -XstartOnFirstThread @@ -349,18 +355,18 @@ true true + + tycho-snapshots + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + true + false + dash-licenses-snapshots https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/ true false - - tycho-snapshots - https://repo.eclipse.org/content/repositories/tycho-snapshots/ - false - true - From e5a169ba80e4acd3a1be1e0a509e0e08a0b34131 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:24:19 +0000 Subject: [PATCH 12/12] build(deps): bump tycho-version from 4.0.5 to 4.0.6 Bumps `tycho-version` from 4.0.5 to 4.0.6. Updates `org.eclipse.tycho:tycho-buildtimestamp-jgit` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) Updates `org.eclipse.tycho.extras:tycho-sourceref-jgit` from 4.0.5 to 4.0.6 Updates `org.eclipse.tycho:tycho-maven-plugin` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) Updates `org.eclipse.tycho:target-platform-configuration` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) Updates `org.eclipse.tycho:tycho-source-plugin` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) Updates `org.eclipse.tycho:tycho-p2-plugin` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) Updates `org.eclipse.tycho:tycho-packaging-plugin` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) Updates `org.eclipse.tycho.extras:tycho-p2-extras-plugin` from 4.0.5 to 4.0.6 Updates `org.eclipse.tycho:tycho-surefire-plugin` from 4.0.5 to 4.0.6 Updates `org.eclipse.tycho:tycho-gpg-plugin` from 4.0.5 to 4.0.6 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/tycho-4.0.6/RELEASE_NOTES.md) - [Commits](https://github.com/eclipse-tycho/tycho/compare/tycho-4.0.5...tycho-4.0.6) --- updated-dependencies: - dependency-name: org.eclipse.tycho:tycho-buildtimestamp-jgit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho.extras:tycho-sourceref-jgit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:tycho-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:target-platform-configuration dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:tycho-source-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:tycho-p2-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:tycho-packaging-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho.extras:tycho-p2-extras-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:tycho-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.tycho:tycho-gpg-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f47e8f6b9..1f9fe8dd2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 - 4.0.5 + 4.0.6 ../target/jacoco.exec scm:git:https://github.com/eclipse/tm4e.git