Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-06-06 08:18:02 +0000
committerAlexander Kurtakov2018-06-06 08:19:28 +0000
commitb7d8903644a26c2bb9393dbdc59250316de05ed7 (patch)
tree3e4a37fcd76c1f71a5b104f5a1fdb34e83f442e9
parent137459aa9b873954ba17bf2d124d208562b1d7f9 (diff)
downloadeclipse.platform.swt-b7d8903644a26c2bb9393dbdc59250316de05ed7.tar.gz
eclipse.platform.swt-b7d8903644a26c2bb9393dbdc59250316de05ed7.tar.xz
eclipse.platform.swt-b7d8903644a26c2bb9393dbdc59250316de05ed7.zip
Bug 518669 - Drop support for Linux ppc64 in 4.9
Remove build support and tests running setup for ppc64 in swt. Change-Id: I488a6ce9398baca50a7fe1fdd4fa1163868fbf3d Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh37
-rw-r--r--bundles/org.eclipse.swt/META-INF/p2.inf13
-rw-r--r--bundles/org.eclipse.swt/buildFragment.xml1
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml21
-rw-r--r--local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf41
-rw-r--r--tests/org.eclipse.swt.tests.fragments.feature/feature.xml11
6 files changed, 29 insertions, 95 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 b8766a661f..db3c0650fc 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -172,17 +172,6 @@ case $SWT_OS.$SWT_ARCH in
export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
fi
;;
- "linux.ppc64")
- if [ "${CC}" = "" ]; then
- export CC=gcc
- fi
- if [ "${JAVA_HOME}" = "" ]; then
- export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
- fi
- if [ "${PKG_CONFIG_PATH}" = "" ]; then
- export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/"
- fi
- ;;
"linux.ppc64le")
if [ "${CC}" = "" ]; then
export CC=gcc
@@ -205,35 +194,21 @@ case $SWT_OS.$SWT_ARCH in
export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
fi
;;
- "aix.ppc64")
- if [ "${CC}" = "" ]; then
- export CC=gcc
- fi
- if [ "${JAVA_HOME}" = "" ]; then
- export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"
- fi
- ;;
esac
# For 64-bit CPUs, we have a switch
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
SWT_PTR_CFLAGS=-DJNI64
if [ -d /lib64 ]; then
XLIB64=-L/usr/X11R6/lib64
export XLIB64
fi
- if [ ${MODEL} = 'ppc64' -o ${MODEL} = 'ppc64le' ]; then
- if [ ${OS} = 'AIX' ]; then
- SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -maix64"
- SWT_LFLAGS=-maix64
- export SWT_LFLAGS
- else
- SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
- XLIB64="${XLIB64} -L/usr/lib64"
- SWT_LFLAGS=-m64
- export SWT_LFLAGS
- fi
+ if [ ${MODEL} = 'ppc64le' ]; then
+ SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64"
+ XLIB64="${XLIB64} -L/usr/lib64"
+ SWT_LFLAGS=-m64
+ export SWT_LFLAGS
fi
export SWT_PTR_CFLAGS
fi
diff --git a/bundles/org.eclipse.swt/META-INF/p2.inf b/bundles/org.eclipse.swt/META-INF/p2.inf
index f15d59655d..64628e51c7 100644
--- a/bundles/org.eclipse.swt/META-INF/p2.inf
+++ b/bundles/org.eclipse.swt/META-INF/p2.inf
@@ -26,16 +26,11 @@ requires.5.range = [$version$,$version$]
requires.5.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
requires.6.namespace = org.eclipse.equinox.p2.iu
-requires.6.name = org.eclipse.swt.gtk.linux.ppc64
+requires.6.name = org.eclipse.swt.gtk.linux.x86_64
requires.6.range = [$version$,$version$]
-requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
requires.7.namespace = org.eclipse.equinox.p2.iu
-requires.7.name = org.eclipse.swt.gtk.linux.x86_64
+requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
requires.7.range = [$version$,$version$]
-requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
-
-requires.8.namespace = org.eclipse.equinox.p2.iu
-requires.8.name = org.eclipse.swt.gtk.linux.ppc64le
-requires.8.range = [$version$,$version$]
-requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
+requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
index 9d81b52b86..1c2628bc52 100644
--- a/bundles/org.eclipse.swt/buildFragment.xml
+++ b/bundles/org.eclipse.swt/buildFragment.xml
@@ -235,7 +235,6 @@
<or>
<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"/>
<equals arg1="${swt.arch}" arg2="sparcv9"/>
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index d9fb2ca92e..d55e7d4d54 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -60,10 +60,6 @@
</antcall>
<antcall target="check_fragment_libraries">
<param name="library_count" value="9"/>
- <param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64"/>
- </antcall>
- <antcall target="check_fragment_libraries">
- <param name="library_count" value="9"/>
<param name="fragment" value="org.eclipse.swt.gtk.linux.ppc64le"/>
</antcall>
<antcall target="check_fragment_libraries">
@@ -131,14 +127,6 @@
trust="true"
outputproperty="m_linux_x86_64_output"
command="hostname"/>
- <sshexec host="${m_linux_ppc64}"
- port="2254"
- username="swtbuild"
- keyfile="${keyfile}"
- failonerror="false"
- trust="true"
- outputproperty="m_linux_ppc64_output"
- command="hostname"/>
<sshexec host="${m_linux_ppc64le}"
port="2256"
username="swtbuild"
@@ -169,12 +157,6 @@
<matches pattern="x${m_linux_x86_64_output}*" string="x${m_linux_x86_64}"/>
</and>
</condition>
- <condition property="m_linux_ppc64_test" value="${success_msg}" else="${fail_msg}">
- <and>
- <length string="${m_linux_ppc64_output}" when="greater" length="0"/>
- <matches pattern="x${m_linux_ppc64_output}*" string="x${m_linux_ppc64}"/>
- </and>
- </condition>
<condition property="m_linux_ppc64le_test" value="${success_msg}" else="${fail_msg}">
<and>
<length string="${m_linux_ppc64le_output}" when="greater" length="0"/>
@@ -192,12 +174,11 @@
<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_ppc64} - ${m_linux_ppc64_test}</echo>
<echo>${m_linux_ppc64le} - ${m_linux_ppc64le_test}</echo>
<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_ppc64_test} ${m_mac_test}"/>
+ <matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/>
</condition>
<fail if="m_fail" message="Failed"/>
</target>
diff --git a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
index 6aba595d6e..7aac548cb4 100644
--- a/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
+++ b/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
@@ -1,35 +1,30 @@
# pull in the applicable implementation fragment at build time (bug 461427)
+requires.1.namespace = org.eclipse.equinox.p2.iu
+requires.1.name = org.eclipse.swt.win32.win32.x86
+requires.1.range = 0.0.0
+requires.1.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86))
+
+requires.2.namespace = org.eclipse.equinox.p2.iu
+requires.2.name = org.eclipse.swt.win32.win32.x86_64
+requires.2.range = 0.0.0
+requires.2.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64))
+
requires.3.namespace = org.eclipse.equinox.p2.iu
-requires.3.name = org.eclipse.swt.win32.win32.x86
+requires.3.name = org.eclipse.swt.gtk.linux.x86
requires.3.range = 0.0.0
-requires.3.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86))
+requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86))
requires.4.namespace = org.eclipse.equinox.p2.iu
-requires.4.name = org.eclipse.swt.win32.win32.x86_64
+requires.4.name = org.eclipse.swt.cocoa.macosx.x86_64
requires.4.range = 0.0.0
-requires.4.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64))
+requires.4.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64))
requires.5.namespace = org.eclipse.equinox.p2.iu
-requires.5.name = org.eclipse.swt.gtk.linux.x86
+requires.5.name = org.eclipse.swt.gtk.linux.x86_64
requires.5.range = 0.0.0
-requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86))
+requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64))
requires.6.namespace = org.eclipse.equinox.p2.iu
-requires.6.name = org.eclipse.swt.cocoa.macosx.x86_64
+requires.6.name = org.eclipse.swt.gtk.linux.ppc64le
requires.6.range = 0.0.0
-requires.6.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64))
-
-requires.7.namespace = org.eclipse.equinox.p2.iu
-requires.7.name = org.eclipse.swt.gtk.linux.ppc64
-requires.7.range = 0.0.0
-requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64))
-
-requires.8.namespace = org.eclipse.equinox.p2.iu
-requires.8.name = org.eclipse.swt.gtk.linux.x86_64
-requires.8.range = 0.0.0
-requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64))
-
-requires.9.namespace = org.eclipse.equinox.p2.iu
-requires.9.name = org.eclipse.swt.gtk.linux.ppc64le
-requires.9.range = 0.0.0
-requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le))
+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le))
diff --git a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
index be4e13ad8d..e0ce8c6eda 100644
--- a/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
+++ b/tests/org.eclipse.swt.tests.fragments.feature/feature.xml
@@ -42,17 +42,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.swt.gtk.linux.ppc64"
- os="linux"
- ws="gtk"
- arch="ppc64"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.eclipse.swt.gtk.linux.ppc64le"
os="linux"
ws="gtk"

Back to the top