November 30, 2017
-- The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at http://www.eclipse.org/legal/epl-2.0. - For purposes of the EPL, "Program" will mean the Content. -
- -- If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at http://www.eclipse.org. -
- - - \ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties deleted file mode 100644 index 5eb4bbdbaac..00000000000 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2011, 2022 IBM Corporation and others. -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = META-INF/,\ - launcher.cocoa.macosx.aarch64.properties,\ - about.html - -generateSourceBundle=false -binaryTag=LBv1-1902 - -# Maven properties, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless -tycho.pomless.parent = ../../launcher-binary-parent -pom.model.property.os = macosx -pom.model.property.ws = cocoa -pom.model.property.arch = aarch64 diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt deleted file mode 100644 index 2bdd0ab400b..00000000000 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt +++ /dev/null @@ -1,2 +0,0 @@ -# To force a version qualifier update add the bug here -Bug 573793 - 4.20 I-Build: I20210526-1800 - Comparator Errors Found \ No newline at end of file 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) diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml index 12beb75c5a0..e1fa92762b5 100755 --- a/features/org.eclipse.equinox.executable.feature/feature.xml +++ b/features/org.eclipse.equinox.executable.feature/feature.xml @@ -37,13 +37,6 @@ arch="aarch64" version="0.0.0"/> -