diff options
author | Arun Thondapu | 2016-05-11 12:32:57 +0000 |
---|---|---|
committer | Arun Thondapu | 2016-05-19 17:31:35 +0000 |
commit | 7e2c80cd243eb1d25c31b1802eafe88e082be174 (patch) | |
tree | 90ac91226eecba871acc839756c4148a47d717f2 | |
parent | 30bf5c3cfa5ceeed1b1787841e1b91351aa8d483 (diff) | |
download | rt.equinox.framework-7e2c80cd243eb1d25c31b1802eafe88e082be174.tar.gz rt.equinox.framework-7e2c80cd243eb1d25c31b1802eafe88e082be174.tar.xz rt.equinox.framework-7e2c80cd243eb1d25c31b1802eafe88e082be174.zip |
Bug 491519 - Need 64-bit launcher for Solaris/SPARCI20160521-1500I20160520-2000I20160519-1730
Change-Id: Id75d6db2a397e8e8da9a3fc5648bdff6199bb83c
Signed-off-by: Arun Thondapu <arunkumar.thondapu@in.ibm.com>
16 files changed, 288 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/.project b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/.project new file mode 100644 index 000000000..ce8bc35bc --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/.project @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.equinox.launcher.gtk.solaris.sparcv9</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.sparcv9/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/.settings/org.eclipse.pde.core.prefs new file mode 100644 index 000000000..5b1720fac --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,4 @@ +#Wed Dec 06 11:40:21 EST 2006 +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/META-INF/MANIFEST.MF new file mode 100644 index 000000000..92e8ee05c --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/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.solaris.sparcv9;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=sparcv9)) +Bundle-Localization: launcher.gtk.solaris.sparcv9 +Eclipse-BundleShape: dir diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/about.html b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/about.html new file mode 100644 index 000000000..395df3ba9 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/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 ("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 <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, "Program" 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 ("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 <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.sparcv9/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties new file mode 100644 index 000000000..5ceb7c023 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/build.properties @@ -0,0 +1,17 @@ +############################################################################### +# 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/,\ + launcher.gtk.solaris.sparcv9.properties,\ + about.html + +customBuildCallbacks=customBuildCallbacks.xml +generateSourceBundle=false +binaryTag=v20160316-1045 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/customBuildCallbacks.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/customBuildCallbacks.xml new file mode 100644 index 000000000..3773f016f --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/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"> + <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.sparcv9/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/forceQualifierUpdate.txt new file mode 100644 index 000000000..56f1032a8 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/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.solaris.sparcv9/launcher.gtk.solaris.sparcv9.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/launcher.gtk.solaris.sparcv9.properties new file mode 100644 index 000000000..a2871ec58 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/launcher.gtk.solaris.sparcv9.properties @@ -0,0 +1,12 @@ +############################################################################### +# 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 Sparcv9 Fragment +providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/pom.xml new file mode 100644 index 000000000..06ba81800 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9/pom.xml @@ -0,0 +1,30 @@ +<?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.sparcv9</artifactId> + <version>1.1.300-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <properties> + <os>solaris</os> + <ws>gtk</ws> + <arch>sparcv9</arch> + </properties> +</project> diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties index 06719a6e2..84e9f7419 100644 --- a/features/org.eclipse.equinox.executable.feature/build.properties +++ b/features/org.eclipse.equinox.executable.feature/build.properties @@ -49,6 +49,9 @@ root.hpux.gtk.ia64.permissions.755=launcher root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64 root.solaris.gtk.x86_64.permissions.755=launcher +root.solaris.gtk.sparcv9=bin/gtk/solaris/sparcv9 +root.solaris.gtk.sparcv9.permissions.755=launcher + root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml index 1541c487f..401a592df 100755 --- a/features/org.eclipse.equinox.executable.feature/feature.xml +++ b/features/org.eclipse.equinox.executable.feature/feature.xml @@ -32,6 +32,16 @@ fragment="true"/> <plugin + id="org.eclipse.equinox.launcher.gtk.solaris.sparcv9" + os="solaris" + ws="gtk" + arch="sparcv9" + 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..ea47968a1 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -186,8 +186,13 @@ case $defaultOS in CC=cc ;; "sparc") - defaultOSArch="sparc" - [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14" + if [ "`isainfo -k`" = "sparcv9" ]; then + defaultOSArch="sparcv9" + [ -d /bluebird/teamswt/swt-builddir/JDKs/SOLARIS/SPARC64/jdk1.5.0_22 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/SOLARIS/SPARC64/jdk1.5.0_22" + else + defaultOSArch="sparc" + [ -d /bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/SPARC/jdk1.6.0_14" + fi CC=cc ;; *) @@ -241,9 +246,11 @@ 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 +elif [ "$defaultOS" = "solaris" ]; then + if [ "$defaultOSArch" = "x86_64" -o "$defaultOSArch" = "sparcv9" ]; then + M_ARCH=-m64 + export M_ARCH + fi fi LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index c9e8bce0b..991b2fb38 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -512,6 +512,7 @@ <include name="gtk/linux/x86/**/*"/> <include name="gtk/linux/x86_64/**/*"/> <include name="gtk/solaris/x86_64/**/*"/> + <include name="gtk/solaris/sparcv9/**/*"/> <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 9edd9bc96..12b702c91 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.properties +++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties @@ -51,6 +51,9 @@ root.hpux.gtk.ia64.permissions.755=launcher root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64 root.solaris.gtk.x86_64.permissions.755=launcher +root.solaris.gtk.sparcv9=bin/gtk/solaris/sparcv9 +root.solaris.gtk.sparcv9.permissions.755=launcher + root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml index 66f6880d2..859c1c9cf 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.xml +++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml @@ -219,6 +219,13 @@ </copy> <chmod perm="755" dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" includes="launcher" /> </target> + <target name="rootFilessolaris_gtk_sparcv9"> + <mkdir dir="${feature.base}/solaris.gtk.sparcv9/${collectingFolder}"/> + <copy todir="${feature.base}/solaris.gtk.sparcv9/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/bin/gtk/solaris/sparcv9" includes="**" /> + </copy> + <chmod perm="755" dir="${feature.base}/solaris.gtk.sparcv9/${collectingFolder}" includes="launcher" /> + </target> <target name="rootFileshpux_gtk_ia64"> <mkdir dir="${feature.base}/hpux.gtk.ia64/${collectingFolder}"/> <copy todir="${feature.base}/hpux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true"> @@ -246,11 +253,12 @@ <antcall target="rootFileslinux_gtk_ppc64"/> <antcall target="rootFileslinux_gtk_ppc64le"/> <antcall target="rootFileslinux_gtk_arm"/> - <antcall target="rootFileslinux_gtk_aarch64"/> + <antcall target="rootFileslinux_gtk_aarch64"/> <antcall target="rootFileslinux_gtk_x86_64"/> <antcall target="rootFileslinux_gtk_ia64"/> <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFilessolaris_gtk_x86_64"/> + <antcall target="rootFilessolaris_gtk_sparcv9"/> <antcall target="rootFilesaix_gtk_ppc64"/> <antcall target="rootFilesaix_gtk_ppc"/> <antcall target="rootFileshpux_gtk_ia64"/> @@ -96,6 +96,7 @@ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module> <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module> <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64</module> + <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparcv9</module> <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module> <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module> |