Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Francisco2014-05-23 14:07:25 -0400
committerSteve Francisco2014-05-23 14:14:09 -0400
commit94a079864f4d2c37cb3d1e110a6ce5dabb9ea7f2 (patch)
tree4aaaea71e7ee65860413cd1e0a1b9fa7fba2ecb5
parent0203aaba29a64d27358895e672a8a877c250cedb (diff)
downloadrt.equinox.framework-R3_8_maintenance.tar.gz
rt.equinox.framework-R3_8_maintenance.tar.xz
rt.equinox.framework-R3_8_maintenance.zip
bug 435649 - Add linux ppc64le support to 4.2.2+R3_8_maintenance
Signed-off-by: Steve Francisco <cisco@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.equinox.executable/feature.xml10
-rw-r--r--bundles/org.eclipse.equinox.executable/library/gtk/build.sh8
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.properties2
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.xml9
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html28
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties18
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/customBuildCallbacks.xml124
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/forceQualifierUpdate.txt2
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties12
-rw-r--r--bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml31
-rw-r--r--pom.xml1
12 files changed, 254 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/feature.xml b/bundles/org.eclipse.equinox.executable/feature.xml
index 026cfdb49..f125b565b 100644
--- a/bundles/org.eclipse.equinox.executable/feature.xml
+++ b/bundles/org.eclipse.equinox.executable/feature.xml
@@ -111,6 +111,16 @@
fragment="true"/>
<plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
+ os="linux"
+ ws="gtk"
+ arch="ppc64le"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
+
+ <plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
os="linux"
ws="gtk"
diff --git a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
index cc4c49a79..7be707c74 100644
--- a/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/gtk/build.sh
@@ -79,6 +79,12 @@ case $OS in
[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
+ "ppc64le")
+ defaultOSArch="ppc64le"
+ defaultJava=DEFAULT_JAVA_EXEC
+ [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64LE/ibm-java2-ppc64le-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64LE/ibm-java2-ppc64le-50"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
"s390")
defaultOSArch="s390"
defaultJava=DEFAULT_JAVA_EXEC
@@ -184,7 +190,7 @@ elif [ -z "$JAVA_HOME" -a -n "$defaultJavaHome" ]; then
export JAVA_HOME
fi
-if [ "$defaultOSArch" = "ppc64" ]; then
+if [ "$defaultOSArch" = "ppc64" -o $defaultOSArch = "ppc64le" ]; then
if [ "$defaultOS" = "aix" ]; then
M_ARCH=-maix64
else
diff --git a/bundles/org.eclipse.equinox.executable/target.build.properties b/bundles/org.eclipse.equinox.executable/target.build.properties
index 261217d99..655a5e8a0 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.properties
+++ b/bundles/org.eclipse.equinox.executable/target.build.properties
@@ -27,6 +27,8 @@ root.linux.gtk.ppc.permissions.755=libcairo-swt.so
root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
+root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
+
root.macosx.carbon.ppc=bin/carbon/macosx/ppc
root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index de6529bce..a7f89f6b3 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -146,6 +146,14 @@
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="launcher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" />
</target>
+ <target name="rootFileslinux_gtk_ppc64le">
+ <mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/>
+ <copy todir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/linux/ppc64le" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
+ </copy>
+ <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" />
+ </target>
<target name="rootFileslinux_gtk_ppc64">
<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
@@ -286,6 +294,7 @@
<antcall target="rootFileslinux_gtk_x86"/>
<antcall target="rootFileslinux_gtk_ppc"/>
<antcall target="rootFileslinux_gtk_ppc64"/>
+ <antcall target="rootFileslinux_gtk_ppc64le"/>
<antcall target="rootFileslinux_gtk_x86_64"/>
<antcall target="rootFileslinux_gtk_ia64"/>
<antcall target="rootFileslinux_gtk_s390x"/>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..df8a0bff5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.ppc64le;singleton:=true
+Bundle-Version: 1.0.200.qualifier
+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=ppc64le))
+Bundle-Localization: launcher.gtk.linux.ppc64le
+Eclipse-BundleShape: dir
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html
new file mode 100644
index 000000000..395df3ba9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/about.html
@@ -0,0 +1,28 @@
+<!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.linux.ppc64le/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
new file mode 100644
index 000000000..48dbd0f8f
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2011 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.linux.ppc64le.properties,\
+ about.html
+
+customBuildCallbacks=customBuildCallbacks.xml
+generateSourceBundle=false
+binaryTag=v20131120-1123
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/customBuildCallbacks.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/customBuildCallbacks.xml
new file mode 100644
index 000000000..294515f91
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/customBuildCallbacks.xml
@@ -0,0 +1,124 @@
+<!-- ===================================================================== -->
+<!-- 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" unless="dontFetchBinaries">
+ <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.linux.ppc64le/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/forceQualifierUpdate.txt
new file mode 100644
index 000000000..56f1032a8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/forceQualifierUpdate.txt
@@ -0,0 +1,2 @@
+# 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.linux.ppc64le/launcher.gtk.linux.ppc64le.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties
new file mode 100644
index 000000000..65ab02e01
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/launcher.gtk.linux.ppc64le.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2007, 2009 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 Linux PPC64LE Fragment
+providerName = Eclipse.org - Equinox
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml
new file mode 100644
index 000000000..4601721d9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2012 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.2.2-SNAPSHOT</version>
+ <relativePath>../../launcher-binary-parent</relativePath>
+ </parent>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.launcher.gtk.linux.ppc64le</artifactId>
+ <version>1.0.200-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <properties>
+ <launcher-binary.version>1500</launcher-binary.version>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>ppc64le</arch>
+ </properties>
+</project>diff --git a/bundles/org.eclipse.equinox.executable/feature.xml b/bundles/org.eclipse.equinox.executable/feature.xml
diff --git a/pom.xml b/pom.xml
index c933167a1..63a726082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
<module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>

Back to the top