Skip to content

Commit

Permalink
Always use full-named o.e.equinox.launcher artifact
Browse files Browse the repository at this point in the history
For for Mac OS X there was no equinox-launcher fragment for CARBON with
full name, i.e. with <ws>.<os>.<arch> 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 eclipse-equinox/equinox#622

[1] - https://download.eclipse.org/eclipse/updates/4.2/R-4.2-201206081400
  • Loading branch information
HannesWell committed May 19, 2024
1 parent 5073d13 commit 78cff17
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 78cff17

Please sign in to comment.