Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-03-30 11:57:23 -0400
committerThomas Watson2016-03-30 11:57:23 -0400
commit16785826eacbec5b188ae385374ae16a6a995bc1 (patch)
tree5e91fad8d6f1ee14e066648cfe3b595498c172a2
parentfbf4e7bbb85949f0cc7f759254baae0f9b6449c3 (diff)
downloadrt.equinox.framework-16785826eacbec5b188ae385374ae16a6a995bc1.tar.gz
rt.equinox.framework-16785826eacbec5b188ae385374ae16a6a995bc1.tar.xz
rt.equinox.framework-16785826eacbec5b188ae385374ae16a6a995bc1.zip
Revert "Bug 429335 - Need 64-bit launcher for Solaris/X86_64"I20160330-1230
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project22
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/about.html28
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties18
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml124
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/launcher.gtk.solaris.x86_64.properties12
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml30
-rw-r--r--features/org.eclipse.equinox.executable.feature/build.properties3
-rw-r--r--features/org.eclipse.equinox.executable.feature/feature.xml10
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/gtk/build.sh12
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak7
-rw-r--r--features/org.eclipse.equinox.executable.feature/pom.xml43
-rw-r--r--features/org.eclipse.equinox.executable.feature/resources/build.properties2
-rw-r--r--features/org.eclipse.equinox.executable.feature/resources/build.xml8
-rw-r--r--pom.xml1
16 files changed, 5 insertions, 327 deletions
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.equinox.launcher.gtk.solaris.x86_64</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).
-Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor&rsquo;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 <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html> \ 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 @@
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
- <!-- ===================================================================== -->
- <!-- Default target -->
- <!-- ===================================================================== -->
- <target name="noDefault">
- <echo message="This file must be called with explicit targets" />
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.jars -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.jars">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="pre.build.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target build.sources -->
- <!-- Available parameters : -->
- <!-- build.result.folder - folder to contain the build results -->
- <!-- ===================================================================== -->
- <target name="post.build.sources">
- </target>
-
- <target name="pre.gather.bin.parts">
- <property file="${basedir}/build.properties" />
- <basename file="${basedir}" property="fragmentName" />
- <available file="/gitroot/equinox/rt.equinox.binaries.git" type="dir" property="gitRepo" value="/gitroot/equinox/rt.equinox.binaries.git" />
- <property name="gitRepo" value="ssh://git.eclipse.org/gitroot/equinox/rt.equinox.binaries.git" />
-
- <exec dir="${basedir}" executable="git" output="${basedir}/binary.tar" errorproperty="errorResult" >
- <arg line="archive --format=tar --remote=${gitRepo} ${binaryTag} ${fragmentName}" />
- </exec>
-
- <copy todir="${basedir}">
- <tarfileset includes="${fragmentName}/**" src="${basedir}/binary.tar" />
- <globmapper from="${fragmentName}/*" to="*" />
- </copy>
-
- <delete file="${basedir}/binary.tar" failonerror="false" quiet="true" />
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.bin.parts -->
- <!-- Available parameters : -->
- <!-- base.dir - root of the project -->
- <!-- build.result.folder - folder containing the build results -->
- <!-- target.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.bin.parts">
- <chmod perm="755" dir="${target.folder}" includes="eclipse_*" />
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.sources -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.sources">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target gather.logs -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="post.gather.logs">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do before the target clean -->
- <!-- Available parameters : -->
- <!-- destination.temp.folder - destination folder -->
- <!-- ===================================================================== -->
- <target name="pre.clean">
- </target>
-
- <!-- ===================================================================== -->
- <!-- Steps to do after the target clean -->
- <!-- Available parameters : -->
- <!-- plugin.destination - final destination of the build -->
- <!-- build.result.folder - results of the compilation -->
- <!-- temp.folder - temporary folder -->
- <!-- ===================================================================== -->
- <target name="post.clean">
- </target>
-</project>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2016 Eclipse Foundation.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Igor Fedorenko - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>launcher-binary-parent</artifactId>
- <groupId>org.eclipse.equinox.framework</groupId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../../launcher-binary-parent</relativePath>
- </parent>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86_64</artifactId>
- <version>1.1.300-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
- <properties>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </properties>
-</project>
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
@@ -42,16 +42,6 @@
fragment="true"/>
<plugin
- id="org.eclipse.equinox.launcher.gtk.solaris.x86_64"
- os="solaris"
- ws="gtk"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
- <plugin
id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
os="macosx"
ws="cocoa"
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
index 7d81a3576..7ab22c555 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
@@ -176,13 +176,8 @@ case $defaultOS in
fi
case ${PROC} in
"i386" | "x86")
- if [ "`isainfo -k`" = "amd64" ]; then
- defaultOSArch="x86_64"
- [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71"
- else
- defaultOSArch="x86"
- [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14"
- fi
+ defaultOSArch="x86"
+ [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14"
CC=cc
;;
"sparc")
@@ -241,9 +236,6 @@ elif [ "$defaultOSArch" = "ia64" ]; then
elif [ "$defaultOSArch" = "x86" ]; then
M_ARCH=-m32
export M_ARCH
-elif [ "$defaultOS" = "solaris" -a "$defaultOSArch" = "x86_64" ]; then
- M_ARCH=-m64
- export M_ARCH
fi
LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak
index 4d41b5f65..945becf9e 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak
@@ -47,9 +47,8 @@ GTK_LIBS = \
-DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.4\""
-LFLAGS = ${M_ARCH} -G
-CFLAGS = ${M_ARCH} \
- $(OPTFLAG) \
+LFLAGS = -G
+CFLAGS = $(OPTFLAG) \
-DSOLARIS \
$(PICFLAG) \
-DMOZILLA_FIX \
@@ -98,7 +97,7 @@ eclipseNix.o: ../eclipseNix.c
$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
- $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+ $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml
index 09fc6c310..dcb5c15ec 100644
--- a/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/features/org.eclipse.equinox.executable.feature/pom.xml
@@ -224,48 +224,6 @@
</build>
</profile>
<profile>
- <id>build-native-launchers-gtk.solaris.x86_64</id>
- <activation>
- <property>
- <name>native</name>
- <value>gtk.solaris.x86_64</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>compile-executable-natives</id>
- <phase>generate-resources</phase>
- <configuration>
- <target>
- <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>clean-executable-natives</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <ant antfile="build.xml" dir="library/gtk/" target="clean"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>build-native-launchers-gtk.linux.arm</id>
<activation>
<property>
@@ -513,7 +471,6 @@
<include name="gtk/linux/x86_64/**/*"/>
<include name="gtk/solaris/sparc/**/*"/>
<include name="gtk/solaris/x86/**/*"/>
- <include name="gtk/solaris/x86_64/**/*"/>
<include name="win32/win32/x86/**/*"/>
<include name="win32/win32/x86_64/**/*"/>
</fileset>
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 @@
</copy>
<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" />
</target>
- <target name="rootFilessolaris_gtk_x86_64">
- <mkdir dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}"/>
- <copy todir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
- <fileset dir="${basedir}/bin/gtk/solaris/x86_64" includes="**" />
- </copy>
- <chmod perm="755" dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" includes="launcher" />
- </target>
<target name="rootFileshpux_gtk_ia64_32">
<mkdir dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}"/>
<copy todir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
@@ -266,7 +259,6 @@
<antcall target="rootFileslinux_gtk_s390x"/>
<antcall target="rootFilessolaris_gtk_sparc"/>
<antcall target="rootFilessolaris_gtk_x86"/>
- <antcall target="rootFilessolaris_gtk_x86_64"/>
<antcall target="rootFilesaix_gtk_ppc64"/>
<antcall target="rootFilesaix_gtk_ppc"/>
<antcall target="rootFileshpux_gtk_ia64_32"/>
diff --git a/pom.xml b/pom.xml
index 8909dd5a4..603dac660 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module>
- <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64</module>
<module>bundles/org.eclipse.equinox.launcher.win32.win32.ia64</module>
<module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>
<module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>

Back to the top