aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Francisco2014-05-23 10:47:33 (EDT)
committerSteve Francisco2014-05-23 15:04:18 (EDT)
commitfb12c868f8a78eba718db694943375a7f90369ff (patch)
treeaa62335c842f5b438a8db95951cebb21564e963f
parent9628930e837a3347a7bda04ff92b46fc17d708d4 (diff)
downloadeclipse.platform.swt-fb12c868f8a78eba718db694943375a7f90369ff.zip
eclipse.platform.swt-fb12c868f8a78eba718db694943375a7f90369ff.tar.gz
eclipse.platform.swt-fb12c868f8a78eba718db694943375a7f90369ff.tar.bz2
bug 435647 - changes to add ppc64le supportrefs/changes/82/27182/2
Signed-off-by: Steve Francisco <cisco@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh34
-rw-r--r--bundles/org.eclipse.swt/buildFragment.xml1
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml17
3 files changed, 49 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 817a07b..9e7ab15 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -219,6 +219,36 @@ case $SWT_OS.$SWT_ARCH in
export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc64/lib/pkgconfig/:/usr/local/GNOME/lib/pkgconfig:/usr/local/gtk2.4/lib/pkgconfig/"
fi
;;
+ "linux.ppc64le")
+ echo ${JAVA_HOME}
+ if [ "${CC}" = "" ]; then
+ export CC=gcc
+ fi
+ if [ "${JAVA_HOME}" = "" ]; then
+ export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/PPC64LE/jre5u10"
+ fi
+ if [ "${MOZILLA_SDK}" = "" ]; then
+ export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc64le/mozilla/dist/sdk"
+ fi
+ if [ "${MOZILLA_LIBS}" = "" ]; then
+ export MOZILLA_LIBS="-m64 -L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+ fi
+ if [ "${MOZILLA_INCLUDES}" = "" ]; then
+ export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
+ fi
+ if [ "${XULRUNNER_SDK}" = "" ]; then
+ export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc64le/mozilla/dist/sdk/"
+ fi
+ if [ "${XULRUNNER_INCLUDES}" = "" ]; then
+ export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
+ fi
+ if [ "${XULRUNNER_LIBS}" = "" ]; then
+ export XULRUNNER_LIBS="-m64 -L${XULRUNNER_SDK}/lib -lxpcomglue"
+ fi
+ if [ "${PKG_CONFIG_PATH}" = "" ]; then
+ export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc64le/lib/pkgconfig/:/usr/local/GNOME/lib/pkgconfig:/usr/local/gtk2.4/lib/pkgconfig/"
+ fi
+ ;;
"solaris.x86")
if [ "${CC}" = "" ]; then
export CC="cc"
@@ -411,13 +441,13 @@ esac
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
export XLIB64
fi
- if [ ${MODEL} = 'ppc64' ]; then
+ if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
if [ ${OS} = 'AIX' ]; then
SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64"
SWT_LFLAGS=-maix64
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 5cbb412..a199fc9 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -422,6 +422,7 @@
<equals arg1="${swt.arch}" arg2="x86_64"/>
<equals arg1="${swt.arch}" arg2="ia64"/>
<equals arg1="${swt.arch}" arg2="ppc64"/>
+ <equals arg1="${swt.arch}" arg2="ppc64le"/>
<equals arg1="${swt.arch}" arg2="s390x"/>
</or>
</condition>
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 56730f4..40604b5 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -94,6 +94,10 @@
</antcall>
<antcall target="check_fragment_libraries">
<param name="library_count" value="11"/>
+ <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/>
+ </antcall>
+ <antcall target="check_fragment_libraries">
+ <param name="library_count" value="11"/>
<param name="fragment" value="org.eclipse.swt.gtk.linux.s390"/>
</antcall>
<antcall target="check_fragment_libraries">
@@ -260,6 +264,13 @@
trust="true"
outputproperty="m_linux_ppc64_output"
command="hostname"/>
+ <sshexec host="${m_linux_ppc64le}"
+ username="swtbuild"
+ keyfile="${keyfile}"
+ failonerror="false"
+ trust="true"
+ outputproperty="m_linux_ppc64le_output"
+ command="hostname"/>
<sshexec host="${m_solaris_sparc}"
username="swtbuild"
@@ -320,6 +331,9 @@
<condition property="m_linux_ppc64_test" value="${success_msg}" else="${fail_msg}">
<matches pattern="${m_linux_ppc64}*" string="${m_linux_ppc64_output}"/>
</condition>
+ <condition property="m_linux_ppc64le_test" value="${success_msg}" else="${fail_msg}">
+ <matches pattern="${m_linux_ppc64le}*" string="${m_linux_ppc64le_output}"/>
+ </condition>
<condition property="m_solaris_sparc_test" value="${success_msg}" else="${fail_msg}">
<matches pattern="${m_solaris_sparc}*" string="${m_solaris_sparc_output}"/>
</condition>
@@ -344,6 +358,7 @@
<echo>${m_linux_rh3_x86_64} ${m_linux_rh3_x86_64_test}</echo-->
<echo>${m_linux_ppc} - ${m_linux_ppc_test}</echo>
<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>
+ <echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo>
<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>
<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>
<echo>${m_aix} - ${m_aix_test}</echo>
@@ -351,7 +366,7 @@
<echo>${m_mac} - ${m_mac_test}</echo>
<echo>-------------------------</echo>
<condition property="m_fail">
- <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>
+ <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_linux_ppc64le_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>
</condition>
<fail if="m_fail" message="Failed"/>
</target>