From 51b7266e4ec8bd60b883f7c7260bfa51694ce0a7 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 13 May 2024 18:57:44 +0200
Subject: [PATCH] Always use full-named launcher library native fragment on Mac

For all supported platforms full-named native launcher fragments exist
with name 'org.eclipse.equinox.launcher.<ws>.<os>.<arch>' for a long
time, even for all architectures supported on mac.

Also remove consideration of old development locations of the launcher
fragments.

This also fixes https://github.com/eclipse-equinox/equinox/issues/625
---
 .../org/eclipse/equinox/launcher/Main.java    | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index ad1b2dfd977..76a14f27246 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -58,7 +58,6 @@
 import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
-import java.util.StringJoiner;
 import java.util.StringTokenizer;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -447,15 +446,6 @@ private String getArch() {
 		return name;
 	}
 
-	private String getFragmentString(String fragmentOS, String fragmentWS, String fragmentArch) {
-		StringJoiner buffer = new StringJoiner("."); //$NON-NLS-1$
-		buffer.add(PLUGIN_ID).add(fragmentWS).add(fragmentOS);
-		if (!(fragmentOS.equals(Constants.OS_MACOSX) && !Constants.ARCH_X86_64.equals(fragmentArch))) {
-			buffer.add(fragmentArch);
-		}
-		return buffer.toString();
-	}
-
 	/**
 	 *  Sets up the JNI bridge to native calls
 	 */
@@ -475,11 +465,8 @@ private void setupJNI(URL[] defaultPath) {
 		}
 		if (libPath == null) {
 			//find our fragment name
-			String fragmentOS = getOS();
-			String fragmentWS = getWS();
-			String fragmentArch = getArch();
-
-			libPath = getLibraryPath(getFragmentString(fragmentOS, fragmentWS, fragmentArch), defaultPath);
+			String fragmentName = String.join(".", PLUGIN_ID, getWS(), getOS(), getArch()); //$NON-NLS-1$
+			libPath = getLibraryPath(fragmentName, defaultPath);
 		}
 		library = libPath;
 		if (library != null)
@@ -509,10 +496,6 @@ private String getLibraryPath(String fragmentName, URL[] defaultPath) {
 				for (int i = urls.length - 1; i >= 0 && libPath == null; i--) {
 					File entryFile = new File(urls[i].getFile());
 					String dir = entryFile.getParent();
-					if (inDevelopmentMode) {
-						String devDir = dir + "/" + PLUGIN_ID + "/fragments"; //$NON-NLS-1$ //$NON-NLS-2$
-						fragment = searchFor(fragmentName, devDir);
-					}
 					if (fragment == null)
 						fragment = searchFor(fragmentName, dir);
 					if (fragment != null)