From 16785826eacbec5b188ae385374ae16a6a995bc1 Mon Sep 17 00:00:00 2001
From: Thomas Watson
Date: Wed, 30 Mar 2016 10:57:23 -0500
Subject: Revert "Bug 429335 - Need 64-bit launcher for Solaris/X86_64"
This reverts commit fbf4e7bbb85949f0cc7f759254baae0f9b6449c3.
---
.../.project | 22 ----
.../META-INF/MANIFEST.MF | 10 --
.../about.html | 28 -----
.../build.properties | 18 ---
.../customBuildCallbacks.xml | 124 ---------------------
.../forceQualifierUpdate.txt | 2 -
.../launcher.gtk.solaris.x86_64.properties | 12 --
.../pom.xml | 30 -----
.../build.properties | 3 -
.../feature.xml | 10 --
.../library/gtk/build.sh | 12 +-
.../library/gtk/make_solaris.mak | 7 +-
.../org.eclipse.equinox.executable.feature/pom.xml | 43 -------
.../resources/build.properties | 2 -
.../resources/build.xml | 8 --
pom.xml | 1 -
16 files changed, 5 insertions(+), 327 deletions(-)
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF/MANIFEST.MF
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/about.html
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/forceQualifierUpdate.txt
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/launcher.gtk.solaris.x86_64.properties
delete mode 100644 bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project
deleted file mode 100644
index a1da5bcb6..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- org.eclipse.equinox.launcher.gtk.solaris.x86_64
-
-
-
-
-
- org.eclipse.pde.ManifestBuilder
-
-
-
-
- org.eclipse.pde.SchemaBuilder
-
-
-
-
-
- org.eclipse.pde.PluginNature
-
-
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF/MANIFEST.MF
deleted file mode 100644
index 17d151f61..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/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.gtk.solaris.x86_64;singleton:=true
-Bundle-Version: 1.1.300.qualifier
-Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86_64))
-Bundle-Localization: launcher.gtk.solaris.x86_64
-Eclipse-BundleShape: dir
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/about.html b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/about.html
deleted file mode 100644
index 395df3ba9..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-About
-
-
-About This Content
-
-June 5, 2006
-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 1.0 ("EPL"). A copy of the EPL is available
-at http://www.eclipse.org/legal/epl-v10.html.
-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.gtk.solaris.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
deleted file mode 100644
index b1d57c067..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2016 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
- eclipse_*.so,\
- launcher.gtk.solaris.x86_64.properties,\
- about.html
-
-customBuildCallbacks=customBuildCallbacks.xml
-generateSourceBundle=false
-binaryTag=v20160316-1045
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml
deleted file mode 100644
index 3773f016f..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/forceQualifierUpdate.txt
deleted file mode 100644
index 56f1032a8..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403352 - Update all parent versions to match our build stream
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/launcher.gtk.solaris.x86_64.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/launcher.gtk.solaris.x86_64.properties
deleted file mode 100644
index 802f63dd1..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/launcher.gtk.solaris.x86_64.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2016 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName = Equinox Launcher Solaris X86_64 Fragment
-providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml
deleted file mode 100644
index 412ad5410..000000000
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- 4.0.0
-
- launcher-binary-parent
- org.eclipse.equinox.framework
- 4.6.0-SNAPSHOT
- ../../launcher-binary-parent
-
- org.eclipse.equinox
- org.eclipse.equinox.launcher.gtk.solaris.x86_64
- 1.1.300-SNAPSHOT
- eclipse-plugin
-
-
- solaris
- gtk
- x86_64
-
-
diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties
index fbe1bc960..025ea6942 100644
--- a/features/org.eclipse.equinox.executable.feature/build.properties
+++ b/features/org.eclipse.equinox.executable.feature/build.properties
@@ -48,9 +48,6 @@ root.hpux.gtk.ia64.permissions.755=launcher
root.solaris.gtk.x86=bin/gtk/solaris/x86
root.solaris.gtk.x86.permissions.755=launcher
-root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64
-root.solaris.gtk.x86_64.permissions.755=launcher
-
root.solaris.gtk.sparc=bin/gtk/solaris/sparc
root.solaris.gtk.sparc.permissions.755=launcher
diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml
index a911ac9fb..b92369a4b 100644
--- a/features/org.eclipse.equinox.executable.feature/feature.xml
+++ b/features/org.eclipse.equinox.executable.feature/feature.xml
@@ -41,16 +41,6 @@
version="0.0.0"
fragment="true"/>
-
-
-
- build-native-launchers-gtk.solaris.x86_64
-
-
- native
- gtk.solaris.x86_64
-
-
-
-
-
- maven-antrun-plugin
-
-
- compile-executable-natives
- generate-resources
-
-
-
-
-
-
- run
-
-
-
- clean-executable-natives
- clean
-
-
-
-
-
-
- run
-
-
-
-
-
-
-
build-native-launchers-gtk.linux.arm
@@ -513,7 +471,6 @@
-
diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties
index 1f9d3d5d3..8207846b8 100644
--- a/features/org.eclipse.equinox.executable.feature/resources/build.properties
+++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties
@@ -50,8 +50,6 @@ root.hpux.gtk.ia64.permissions.755=launcher
root.solaris.gtk.x86=bin/gtk/solaris/x86
root.solaris.gtk.x86.permissions.755=launcher
-root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64
-root.solaris.gtk.x86_64.permissions.755=launcher
root.solaris.gtk.sparc=bin/gtk/solaris/sparc
root.solaris.gtk.sparc.permissions.755=launcher
diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml
index 958f9230f..10008a662 100644
--- a/features/org.eclipse.equinox.executable.feature/resources/build.xml
+++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml
@@ -226,13 +226,6 @@
-
-
-
-
-
-
-
@@ -266,7 +259,6 @@
-
diff --git a/pom.xml b/pom.xml
index 8909dd5a4..603dac660 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64
bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc
bundles/org.eclipse.equinox.launcher.gtk.solaris.x86
- bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64
bundles/org.eclipse.equinox.launcher.win32.win32.ia64
bundles/org.eclipse.equinox.launcher.win32.win32.x86
bundles/org.eclipse.equinox.launcher.win32.win32.x86_64
--
cgit v1.2.3