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 /features/org.eclipse.equinox.executable.feature | |
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>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature')
6 files changed, 38 insertions, 6 deletions
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"/> |