diff options
author | Alexander Kurtakov | 2019-10-14 19:46:06 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-10-14 19:46:06 +0000 |
commit | b8ae716f906ebbf1990a6f209ed545700a876278 (patch) | |
tree | 7a07ce7e223dea7a015b0ac1b99266ac6fc8d23c | |
parent | 8c050cee8e430c4fc524cc83c444a3751771b11f (diff) | |
download | rt.equinox.framework-b8ae716f906ebbf1990a6f209ed545700a876278.tar.gz rt.equinox.framework-b8ae716f906ebbf1990a6f209ed545700a876278.tar.xz rt.equinox.framework-b8ae716f906ebbf1990a6f209ed545700a876278.zip |
Bug 552093 - Remove 32bit launcher code
Drop support in build scripts.
Change-Id: I4fe2e2cd4e1480666aa428f2d0972ed8921f1bde
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
3 files changed, 2 insertions, 109 deletions
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 3c99ed1d7..ac71e22be 100755 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -90,10 +90,6 @@ case $defaultOS in defaultJava=DEFAULT_JAVA_EXEC [ -d /bluebird/teamswt/swt-builddir/JDKs/x86_64/jdk1.5.0 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/x86_64/jdk1.5.0" ;; - i?86 | "x86") - defaultOSArch="x86" - [ -d /bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/x86/ibm-java2-i386-50" - ;; "ppc64le") defaultOSArch="ppc64le" defaultJava=DEFAULT_JAVA_EXEC @@ -101,21 +97,11 @@ case $defaultOS in defaultJavaHome=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"` OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; - "s390") - defaultOSArch="s390" - defaultJava=DEFAULT_JAVA_EXEC - OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch" - ;; "s390x") defaultOSArch="s390x" defaultJava=DEFAULT_JAVA_EXEC OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch" ;; - arm*) - defaultOSArch="arm" - defaultJava=DEFAULT_JAVA_EXEC - OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" - ;; "aarch64") defaultOSArch="aarch64" defaultJava=DEFAULT_JAVA_EXEC @@ -152,19 +138,10 @@ fi if [ $defaultOSArch = "ppc64le" ]; then M_ARCH=-m64 export M_ARCH -elif [ "$defaultOSArch" = "s390" ]; then - if [ "${JAVA_HOME}" = "" ]; then - export JAVA_HOME="/home/swtbuild/java5/s390/ibm-java2-s390-50" - fi - M_ARCH=-m31 - export M_ARCH elif [ "$defaultOSArch" = "s390x" ]; then if [ "${JAVA_HOME}" = "" ]; then export JAVA_HOME="/home/swtbuild/java5/s390x/ibm-java2-s390x-50" fi -elif [ "$defaultOSArch" = "x86" ]; then - M_ARCH=-m32 - export M_ARCH fi LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak index aa6135b26..0a090c10d 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak @@ -45,14 +45,6 @@ EXEC_DIR ?= ../../../../../rt.equinox.binaries/org.eclipse.equinox.executable OUTPUT_DIR ?= $(EXEC_DIR)/bin/$(DEFAULT_WS)/$(DEFAULT_OS)/$(DEFAULT_OS_ARCH) LIBRARY_DIR ?= $(EXEC_DIR)/../org.eclipse.equinox.launcher.$(DEFAULT_WS).$(DEFAULT_OS).$(DEFAULT_OS_ARCH) -# Architecture specific Vars: -# 32 bit specific flag: -ifeq ($(M_ARCH),) -ifeq ($(DEFAULT_OS_ARCH),x86) -M_ARCH ?= -m32 -endif -endif - # 64 bit specific flag: ifeq ($(M_CFLAGS),) ifeq ($(DEFAULT_OS_ARCH),x86_64) @@ -64,8 +56,6 @@ endif # Determine launch mode. ifeq ($(DEFAULT_OS_ARCH),x86_64) DEFAULT_JAVA ?= DEFAULT_JAVA_EXEC -else ifeq ($(DEFAULT_OS_ARCH),x86) -DEFAULT_JAVA ?= DEFAULT_JAVA_JNI endif CC ?= gcc @@ -160,7 +150,7 @@ dev_build_install: all ifeq "$(origin DEV_ECLIPSE)" "environment" $(info Copying $(EXEC) and $(DLL) into your development eclipse folder:) cp $(EXEC) ${DEV_ECLIPSE}/ - cp $(DLL) ${DEV_ECLIPSE}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_*/ + cp $(DLL) ${DEV_ECLIPSE}/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/ else $(error $(DEV_INSTALL_ERROR_MSG)) endif diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml index ba232dd99..297ae849f 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.xml +++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml @@ -48,16 +48,6 @@ <subant target="rootFiles${os}_${ws}_${arch}" buildpath="." failonerror="false" inheritall="true"/> </target> - <target name="rootFileswin32_win32_x86"> - <mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/> - <copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/win32/win32/x86"> - <include name="launcher.exe"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="launcher.exe" /> - </target> - <target name="rootFileswin32_win32_x86_64"> <mkdir dir="${feature.base}/win32.win32.x86_64/${collectingFolder}"/> <copy todir="${feature.base}/win32.win32.x86_64/${collectingFolder}" failonerror="true" overwrite="true"> @@ -78,38 +68,6 @@ <chmod perm="755" dir="${feature.base}/win32.win32.ia64/${collectingFolder}" includes="launcher.exe" /> </target> - <target name="rootFilesmacosx_carbon_ppc"> - <mkdir dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}"/> - <copy todir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/carbon/macosx/ppc" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="${launcherName}" /> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> - </target> - <target name="rootFilesmacosx_carbon_x86"> - <mkdir dir="${feature.base}/macosx.carbon.x86/${collectingFolder}"/> - <copy todir="${feature.base}/macosx.carbon.x86/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/carbon/macosx/x86" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}" /> - <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> - </target> - <target name="rootFilesmacosx_cocoa_ppc"> - <mkdir dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}"/> - <copy todir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/cocoa/macosx/ppc" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="${launcherName}" /> - <chmod perm="755" dir="${feature.base}/macosx.cocoa.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> - </target> - <target name="rootFilesmacosx_cocoa_x86"> - <mkdir dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}"/> - <copy todir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/cocoa/macosx/x86" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="${launcherName}" /> - <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> - </target> <target name="rootFilesmacosx_cocoa_x86_64"> <mkdir dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}"/> <copy todir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" failonerror="true" overwrite="true"> @@ -118,22 +76,6 @@ <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="${launcherName}" /> <chmod perm="755" dir="${feature.base}/macosx.cocoa.x86_64/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/launcher" /> </target> - <target name="rootFileslinux_gtk_x86"> - <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/gtk/linux/x86" includes="**" /> - <fileset dir="${basedir}/gtk_root" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="launcher" /> - </target> - <target name="rootFileslinux_gtk_ppc"> - <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/gtk/linux/ppc" includes="**" /> - <fileset dir="${basedir}/gtk_root" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${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"> @@ -142,15 +84,7 @@ </copy> <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" /> </target> - <target name="rootFileslinux_gtk_arm"> - <mkdir dir="${feature.base}/linux.gtk.arm/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.arm/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/bin/gtk/linux/arm" includes="**" /> - <fileset dir="${basedir}/gtk_root" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.arm/${collectingFolder}" includes="launcher" /> - </target> - <target name="rootFileslinux_gtk_aarch64"> + <target name="rootFileslinux_gtk_aarch64"> <mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/> <copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> <fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**" /> @@ -180,14 +114,6 @@ </copy> <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="launcher" /> </target> - <target name="rootFileslinux_gtk_s390"> - <mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/contributed/gtk/linux/s390" includes="**" /> - <fileset dir="${basedir}/gtk_root" includes="**" /> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="launcher" /> - </target> <target name="rootFilessolaris_gtk_x86_64"> <mkdir dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}"/> <copy todir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true"> |