MacOS AArch64 launcher is its own fragment now.

Fix for #1423
eclipse-pde · Oct 3, 2024 · 151075f · 151075f
1 parent 3f973e8
commit 151075f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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<Entry> plugins, Set<Entry> 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
@@ -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());