From 151075f9f879c7ba8fe53cec6ef738bd1f5a60b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Thu, 3 Oct 2024 17:37:09 +0300 Subject: [PATCH] MacOS AArch64 launcher is its own fragment now. Fix for https://github.com/eclipse-pde/eclipse.pde/issues/1423 --- .../org/eclipse/pde/internal/build/FeatureGenerator.java | 8 ++------ .../org/eclipse/pde/internal/build/ProductGenerator.java | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java index b6bfa9e837..0d46a572cc 100644 --- a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java +++ b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FeatureGenerator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2021 IBM Corporation and others. + * Copyright (c) 2006, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -347,11 +347,7 @@ private void addLauncher(PDEState state, Set plugins, Set fragment // only include the fragments for the platforms we are attempting to build, since the others // probably aren't around for (Config config : configs) { - String fragment = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs(); - //macosx doesn't have the arch on its fragment - if (config.getOs().compareToIgnoreCase("macosx") != 0 || config.getArch().equals("x86_64")) {//$NON-NLS-1$ //$NON-NLS-2$ - fragment += '.' + config.getArch(); - } + String fragment = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs() + '.' + config.getArch(); if (!contains(fragments, fragment)) { Entry entry = new Entry(fragment); entry.addAttribute("unpack", "true"); //$NON-NLS-1$//$NON-NLS-2$ diff --git a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java index 4996518445..41e9f2c80e 100644 --- a/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java +++ b/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductGenerator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2021 IBM Corporation and others. + * Copyright (c) 2006, 2024 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -279,9 +279,7 @@ private void generateP2InfCUs(StringBuffer buffer, int startIndex, boolean cus, for (Config config : configs) { if (config.equals(Config.genericConfig())) continue; - String fragmentName = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs(); - if (config.getOs().compareToIgnoreCase("macosx") != 0 || config.getArch().equals("x86_64")) //$NON-NLS-1$ //$NON-NLS-2$ - fragmentName += '.' + config.getArch(); + String fragmentName = BUNDLE_EQUINOX_LAUNCHER + '.' + config.getWs() + '.' + config.getOs() + '.' + config.getArch(); BundleDescription fragment = assembly.getPlugin(fragmentName, null); if (fragment != null) { VersionRange fragmentRange = Utils.createExactVersionRange(fragment.getVersion());