From 773fe3966922d38b1ddb3ca634c4f3ac4505beb5 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Wed, 8 May 2024 23:54:47 +0200 Subject: [PATCH] Remove short-named equinox.launcher.cocoa.macosx fragment and its usage The full-named org.eclipse.equinox.launcher.cocoa.macosx.x86_64 fragment exists for a long time already and users of the old short-named variant should have had enough time to migrate. And remove consideration of old development locations of the launcher fragments. --- .../.project | 22 ------------ .../META-INF/MANIFEST.MF | 10 ------ .../about.html | 36 ------------------- .../build.properties | 25 ------------- .../forceQualifierUpdate.txt | 2 -- .../launcher.cocoa.macosx.aarch64.properties | 15 -------- .../feature.xml | 7 ---- pom.xml | 1 - 8 files changed, 118 deletions(-) delete mode 100644 bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project delete mode 100644 bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF delete mode 100644 bundles/org.eclipse.equinox.launcher.cocoa.macosx/about.html delete mode 100644 bundles/org.eclipse.equinox.launcher.cocoa.macosx/build.properties delete mode 100644 bundles/org.eclipse.equinox.launcher.cocoa.macosx/forceQualifierUpdate.txt delete mode 100644 bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.aarch64.properties diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project deleted file mode 100644 index e3ceabe16c4..00000000000 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.eclipse.equinox.launcher.cocoa.macosx - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF deleted file mode 100644 index 151778a0da0..00000000000 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-SymbolicName: org.eclipse.equinox.launcher.cocoa.macosx;singleton:=true -Bundle-Version: 1.2.1100.qualifier -Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.6.0,1.7.0)" -Eclipse-PlatformFilter: (& (osgi.ws=cocoa) (osgi.os=macosx) (osgi.arch=aarch64) ) -Bundle-Localization: launcher.cocoa.macosx.aarch64 -Eclipse-BundleShape: dir diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/about.html b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/about.html deleted file mode 100644 index 164f781a8fd..00000000000 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/about.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - -About - - -

About This Content

- -

November 30, 2017

-

License

- -

- 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 cb6a7512406..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-1904 - -# 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.cocoa.macosx/launcher.cocoa.macosx.aarch64.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.aarch64.properties deleted file mode 100644 index c13c830c698..00000000000 --- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx/launcher.cocoa.macosx.aarch64.properties +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# Copyright (c) 2008, 2009 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 -############################################################################### -pluginName = Equinox Launcher MacOSX Cocoa AARCH64/ARM64 Fragment -providerName = Eclipse.org - Equinox diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml index ccaaaf78d48..09b4c6321b5 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"/> - - bundles/org.eclipse.osgi/supplement bundles/org.eclipse.equinox.launcher - bundles/org.eclipse.equinox.launcher.cocoa.macosx bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64 bundles/org.eclipse.equinox.launcher.cocoa.macosx.aarch64 bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64