aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Francisco2014-05-28 10:33:10 (EDT)
committerSteve Francisco2014-05-28 10:33:10 (EDT)
commit039305c74ccdde6bc90333ebb59140ca2720c2fa (patch)
tree88916723553265051771d6e8733eb806080e786c
parentfb12c868f8a78eba718db694943375a7f90369ff (diff)
downloadeclipse.platform.swt-039305c74ccdde6bc90333ebb59140ca2720c2fa.zip
eclipse.platform.swt-039305c74ccdde6bc90333ebb59140ca2720c2fa.tar.gz
eclipse.platform.swt-039305c74ccdde6bc90333ebb59140ca2720c2fa.tar.bz2
bug 436066 - update build.sh for linux.ia64 on 4.2.2+R4_2_maintenancerefs/changes/56/27456/1
Signed-off-by: Steve Francisco <cisco@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh37
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml20
2 files changed, 56 insertions, 1 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 9e7ab15..2d0811d 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
@@ -161,6 +161,38 @@ case $SWT_OS.$SWT_ARCH in
export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
fi
;;
+ "linux.ia64")
+ if [ "${CC}" = "" ]; then
+ export CC=gcc
+ fi
+ if [ "${JAVA_HOME}" = "" ]; then
+ export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/ia64/jdk1.5.0"
+ fi
+ if [ "${PKG_CONFIG_PATH}" = "" ]; then
+ export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
+ fi
+ if [ "${MOZILLA_SDK}" = "" ]; then
+ export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/mozilla/1.7/amd64/mozilla/dist/sdk"
+ fi
+ if [ "${MOZILLA_INCLUDES}" = "" ]; then
+ export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
+ fi
+ if [ "${MOZILLA_LIBS}" = "" ]; then
+ export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
+ fi
+ if [ "${XULRUNNER_SDK}" = "" ]; then
+ export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/amd64/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="-L${XULRUNNER_SDK}/lib -lxpcomglue"
+ fi
+ if [ "${XULRUNNER24_SDK}" = "" ]; then
+ export XULRUNNER24_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/24/ia64"
+ fi
+ ;;
"linux.ppc")
if [ "${CC}" = "" ]; then
export CC=gcc
@@ -464,6 +496,11 @@ if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL}
SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -mlp64"
SWT_LFLAGS=-mlp64
export SWT_LFLAGS
+ else
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
+ XLIB64="${XLIB64} -L/usr/lib64"
+ SWT_LFLAGS=-m64
+ export SWT_LFLAGS
fi
fi
if [ ${MODEL} = 'sparc64' ]; then
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 40604b5..2706d1f 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -113,6 +113,10 @@
<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
</antcall>
<antcall target="check_fragment_libraries">
+ <param name="library_count" value="13"/>
+ <param name="fragment" value="org.eclipse.swt.gtk.linux.ia64"/>
+ </antcall>
+ <antcall target="check_fragment_libraries">
<param name="library_count" value="9"/>
<param name="fragment" value="org.eclipse.swt.gtk.solaris.sparc"/>
</antcall>
@@ -234,6 +238,13 @@
trust="true"
outputproperty="m_linux_x86_64_output"
command="hostname"/>
+ <sshexec host="${m_linux_ia64}"
+ username="swtbuild"
+ keyfile="${keyfile}"
+ failonerror="false"
+ trust="true"
+ outputproperty="m_linux_ia64_output"
+ command="hostname"/>
<!-- These machines are only used for 3.5.x builds. -->
<!--sshexec host="${m_linux_rh3_x86}"
username="swtbuild"
@@ -318,6 +329,12 @@
<condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}">
<matches pattern="${m_linux_x86_64}*" string="${m_linux_x86_64_output}"/>
</condition>
+ <condition property="m_linux_ia64_test" value="${success_msg}" else="${fail_msg}">
+ <and>
+ <length string="${m_linux_ia64_output}" when="greater" length="0"/>
+ <matches pattern="x${m_linux_ia64_output}*" string="x${m_linux_ia64}"/>
+ </and>
+ </condition>
<!--condition property="m_linux_rh3_x86_test" value="${success_msg}" else="${fail_msg}">
<matches pattern="${m_linux_rh3_x86}*" string="${m_linux_rh3_x86_output}"/>
</condition>
@@ -354,6 +371,7 @@
<echo></echo>
<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>
<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
+ <echo>${m_linux_ia64} - ${m_linux_ia64_test}</echo>
<!--echo>${m_linux_rh3_x86} ${m_linux_rh3_x86_test}</echo>
<echo>${m_linux_rh3_x86_64} ${m_linux_rh3_x86_64_test}</echo-->
<echo>${m_linux_ppc} - ${m_linux_ppc_test}</echo>
@@ -366,7 +384,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_linux_ppc64le_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_ia64_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>