From 78cff17db2c274f49163b08fdc131bacbdacea78 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 19 May 2024 12:40:50 +0200 Subject: [PATCH] Always use full-named o.e.equinox.launcher artifact For for Mac OS X there was no equinox-launcher fragment for CARBON with full name, i.e. with .. suffix, but only a org.eclipse.equinox.launcher.carbon.macosx fragment. But since Eclipse 4.2, released 2012, CARBON is not supported anymore at all [1]. Therefore the code adjust to that special naming schema, which also imposed difficulties or new supported architectures on Macos should be removed. See also https://github.com/eclipse-equinox/equinox/pull/622 [1] - https://download.eclipse.org/eclipse/updates/4.2/R-4.2-201206081400 --- .../equinox/p2/publisher/eclipse/EquinoxExecutableAction.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java index 0e01f15068..79891de067 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/EquinoxExecutableAction.java @@ -143,9 +143,7 @@ protected boolean publishExecutableIU(ExecutablesDescriptor execDescriptor, IPub String ws = config[0]; String os = config[1]; String arch = config[2]; - String launcherFragment = EquinoxLauncherCUAction.ORG_ECLIPSE_EQUINOX_LAUNCHER + '.' + ws + '.' + os; - if (!(Constants.OS_MACOSX.equals(os) && !Constants.ARCH_X86_64.equals(arch))) - launcherFragment += '.' + arch; + String launcherFragment = EquinoxLauncherCUAction.ORG_ECLIPSE_EQUINOX_LAUNCHER + '.' + ws + '.' + os + '.' + arch; iu.setRequirements(new IRequirement[] {MetadataFactory.createRequirement(IInstallableUnit.NAMESPACE_IU_ID, launcherFragment, VersionRange.emptyRange, filter, false, false)}); } result.addIU(MetadataFactory.createInstallableUnit(iu), IPublisherResult.ROOT);