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 cf559c6 commit d2ffb78
Showing 1 changed file with 1 addition and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.eclipse.tycho.ArtifactKey;
import org.eclipse.tycho.ArtifactType;
import org.eclipse.tycho.DependencyArtifacts;
import org.eclipse.tycho.PlatformPropertiesUtils;
import org.eclipse.tycho.ReactorProject;
import org.eclipse.tycho.TargetEnvironment;
import org.eclipse.tycho.core.ArtifactDependencyVisitor;
Expand Down Expand Up @@ -128,18 +127,7 @@ protected void traverseProduct(ProductConfiguration product, ArtifactDependencyV
String os = environment.getOs();
String ws = environment.getWs();
String arch = environment.getArch();

String id;

// for Mac OS X there is no org.eclipse.equinox.launcher.carbon.macosx.x86 or org.eclipse.equinox.launcher.carbon.macosx.ppc folder,
// only a org.eclipse.equinox.launcher.carbon.macosx folder.
// see https://jira.codehaus.org/browse/MNGECLIPSE-1075
if (PlatformPropertiesUtils.OS_MACOSX.equals(os) && (PlatformPropertiesUtils.ARCH_X86.equals(arch)
|| PlatformPropertiesUtils.ARCH_PPC.equals(arch))) {
id = "org.eclipse.equinox.launcher." + ws + "." + os;
} else {
id = "org.eclipse.equinox.launcher." + ws + "." + os + "." + arch;
}
String id = "org.eclipse.equinox.launcher." + ws + "." + os + "." + arch;

if (!bundles.contains(id)) {
PluginRef ref = new PluginRef("plugin");
Expand Down

0 comments on commit d2ffb78

Please sign in to comment.