Bug 518669 - Drop support for Linux ppc64 in 4.9

Remove launcher fragment and support for building it.

Change-Id: I97f873256f71319a2603aebb6507db7848294eb5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

6 files changed, 4 insertions, 71 deletions

diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties
index 4f5920185..8ffe18e76 100644
--- a/features/org.eclipse.equinox.executable.feature/build.properties
+++ b/features/org.eclipse.equinox.executable.feature/build.properties
@@ -26,9 +26,6 @@ root.win32.win32.x86_64.permissions.755=launcher.exe
 root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
 root.linux.gtk.x86.permissions.755=launcher,libcairo-swt.so
 
-root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
-root.linux.gtk.ppc64.permissions.755=launcher
-
 root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
 root.linux.gtk.ppc64le.permissions.755=launcher
 
diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml
index 26de0ae2a..658fcdfec 100755
--- a/features/org.eclipse.equinox.executable.feature/feature.xml
+++ b/features/org.eclipse.equinox.executable.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.executable"
       label="%featureName"
-      version="3.8.0.qualifier"
+      version="3.8.100.qualifier"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
@@ -32,16 +32,6 @@
          fragment="true"/>
 
    <plugin
-         id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
-         os="linux"
-         ws="gtk"
-         arch="ppc64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
          id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
          os="linux"
          ws="gtk"
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 0766b3f39..2b8fe11e0 100755
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
@@ -91,19 +91,6 @@ case $defaultOS in
 				defaultOSArch="x86"
 				[ -d /bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50"
 				;;
-			"ppc")
-				defaultOSArch="ppc"
-				defaultJava=DEFAULT_JAVA_EXEC
-				#[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC/ibm-java2-ppc-50"
-				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-				;;
-			"ppc64")
-				defaultOSArch="ppc64"
-				defaultJava=DEFAULT_JAVA_EXEC
-				#[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
-				defaultJavaHome=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
-				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-				;;
 			"ppc64le")
 				defaultOSArch="ppc64le"
 				defaultJava=DEFAULT_JAVA_EXEC
@@ -136,14 +123,6 @@ case $defaultOS in
 				;;
 		esac
 		;;
-	"AIX" | "aix")
-		makefile="make_aix.mak"
-		defaultOS="aix"
-		if [ -z "$defaultOSArch" ]; then
-			defaultOSArch="ppc64"
-		fi
-		[ -d /bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/AIX/PPC64/j564/sdk"
-	;;
 	*)
 	echo "Unknown OS -- build aborted"
 	;;
@@ -167,12 +146,8 @@ elif [ -z "$JAVA_HOME" -a -n  "$defaultJavaHome" ]; then
 	export JAVA_HOME
 fi
 
-if [ "$defaultOSArch" = "ppc64" -o $defaultOSArch = "ppc64le" ];  then
-	if [ "$defaultOS" = "aix" ];  then
-		M_ARCH=-maix64
-	else
-		M_ARCH=-m64
-	fi
+if [ $defaultOSArch = "ppc64le" ];  then
+	M_ARCH=-m64
 	export M_ARCH
 elif [ "$defaultOSArch" = "s390" ];  then
 	if [ "${JAVA_HOME}" = "" ]; then
diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml
index b2bd596df..66c474422 100644
--- a/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/features/org.eclipse.equinox.executable.feature/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.executable</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.8.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
@@ -501,7 +501,6 @@
                     <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
                       <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
                         <include name="cocoa/macosx/x86_64/**/*"/>
-                        <include name="gtk/linux/ppc64/**/*"/>
                         <include name="gtk/linux/ppc64le/**/*"/>
                         <include name="gtk/linux/x86/**/*"/>
                         <include name="gtk/linux/x86_64/**/*"/>
diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties
index bcdad5c5a..6c604c1cd 100644
--- a/features/org.eclipse.equinox.executable.feature/resources/build.properties
+++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties
@@ -22,9 +22,6 @@ root.win32.win32.x86_64.permissions.755=launcher.exe
 root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
 root.linux.gtk.x86.permissions.755=launcher,libcairo-swt.so
 
-root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
-root.linux.gtk.ppc64.permissions.755=launcher
-
 root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root
 root.linux.gtk.ppc64le.permissions.755=launcher
 
diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml
index 0555384c2..bc204f210 100644
--- a/features/org.eclipse.equinox.executable.feature/resources/build.xml
+++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml
@@ -134,14 +134,6 @@
 		</copy>
 		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="launcher" />
 	</target>
-	<target name="rootFileslinux_gtk_ppc64">
-		<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
-		<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}/bin/gtk/linux/ppc64" includes="**"			/>
-			<fileset dir="${basedir}/gtk_root" includes="**"			/>
-		</copy>
-		<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="launcher" />
-	</target>
 	<target name="rootFileslinux_gtk_ppc64le">
 		<mkdir dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" failonerror="true" overwrite="true">
@@ -166,22 +158,6 @@
 		</copy>
 		<chmod perm="755" dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" includes="launcher" />
 	</target>
-	<target name="rootFilesaix_gtk_ppc64">
-		<mkdir dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}"/>
-		<copy todir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}/bin/gtk/aix/ppc64" includes="**"			/>
-			<fileset dir="${basedir}/gtk_root" includes="**"			/>
-		</copy>
-		<chmod perm="755" dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" includes="launcher" />
-	</target>
-	<target name="rootFilesaix_gtk_ppc">
-		<mkdir dir="${feature.base}/aix.gtk.ppc/${collectingFolder}"/>
-		<copy todir="${feature.base}/aix.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}/bin/gtk/aix/ppc" includes="**"			/>
-			<fileset dir="${basedir}/gtk_root" includes="**"			/>
-		</copy>
-		<chmod perm="755" dir="${feature.base}/aix.gtk.ppc/${collectingFolder}" includes="launcher" />
-	</target>
 	<target name="rootFileslinux_gtk_x86_64">
 		<mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}"/>
 		<copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
@@ -238,7 +214,6 @@
 		<antcall target="rootFileswin32_win32_x86_64"/>
 		<antcall target="rootFilesmacosx_cocoa_x86_64"/>
 		<antcall target="rootFileslinux_gtk_x86"/>
-		<antcall target="rootFileslinux_gtk_ppc64"/>
 		<antcall target="rootFileslinux_gtk_ppc64le"/>
 		<antcall target="rootFileslinux_gtk_x86_64"/>
 	</target>