Projects
Eulaceura:Factory
eclipse
_service:obs_scm:Remove-32-bit-from-build-scrip...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:obs_scm:Remove-32-bit-from-build-scripts.patch of Package eclipse
From cdf280bd9520d91fcd43cc3099c9764296278945 Mon Sep 17 00:00:00 2001 From: Eric Williams Date: Wed, 27 Mar 2019 09:45:24 -0400 Subject: Bug 545793: [GTK] Remove 32-bit code Remove 32 bit from build scripts. Change-Id: Ib9c66468ae30a0a25045c95f7e606b8d404c09fd Signed-off-by: Eric Williams <ericwill@redhat.com>--- bundles/org.eclipse.swt/buildFragment.xml | 25 --------------- bundles/org.eclipse.swt/buildSWT.xml | 51 ++----------------------------- 2 files changed, 2 insertions(+), 74 deletions(-) diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml index b4944c59d5..180c92ca32 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml @@ -156,7 +156,6 @@ <fileset dir="${plugindir}/Eclipse SWT Program/common/"/> </copy> <antcall target="copy.translationfiles"/> - <antcall target="replace64"/> </target> <target name="copy.gtk.src"> @@ -192,7 +191,6 @@ <fileset dir="${plugindir}/Eclipse SWT WebKit/gtk/"/> </copy> <antcall target="copy.translationfiles"/> - <antcall target="replace64"/> </target> <target name="copy.win32.src"> @@ -223,7 +221,6 @@ <fileset dir="${plugindir}/Eclipse SWT Program/win32/"/> </copy> <antcall target="copy.translationfiles"/> - <antcall target="replace64"/> </target> <target name="copy.translationfiles" if="includetranslationfiles"> @@ -233,28 +230,6 @@ </copy> </target> - <target name="is64"> - <condition property="is64" value="true"> - <or> - <equals arg1="${swt.arch}" arg2="x86_64"/> - <equals arg1="${swt.arch}" arg2="ia64"/> - <equals arg1="${swt.arch}" arg2="ppc64le"/> - <equals arg1="${swt.arch}" arg2="s390x"/> - <equals arg1="${swt.arch}" arg2="sparcv9"/> - <equals arg1="${swt.arch}" arg2="aarch64"/> - </or> - </condition> - <echo>Is64=${is64}</echo> - </target> - - <target name="replace64" depends="is64" unless="is64"> - <echo>Converting java files to 32 bit</echo> - <replace dir="${copy.src.dir}" includes="**/*.java" value="int /*long*/" token="long /*int*/"/> - <replace dir="${copy.src.dir}" includes="**/*.java" value="int[] /*long[]*/" token="long[] /*int[]*/"/> - <replace dir="${copy.src.dir}" includes="**/*.java" value="float /*double*/" token="double /*float*/"/> - <replace dir="${copy.src.dir}" includes="**/*.java" value="float[] /*double[]*/" token="double[] /*float[]*/"/> - </target> - <target name="build.sources" depends="init"> <available property="src.zip" file="${build.result.folder}/src.zip" /> <antcall target="src.zip" /> diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml index bf4faf75b9..9d4bb1b6fe 100644 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml @@ -108,13 +108,6 @@ <target name="check_machines" depends="init_keyfile"> <parallel> - <sshexec host="${m_linux_x86}" - username="swtbuild" - keyfile="${keyfile}" - failonerror="false" - trust="true" - outputproperty="m_linux_x86_output" - command="hostname"/> <sshexec host="${m_linux_x86_64}" username="swtbuild" keyfile="${keyfile}" @@ -140,12 +133,6 @@ </parallel> <property name="success_msg" value="Success"/> <property name="fail_msg" value="*** Fail ***"/> - <condition property="m_linux_x86_test" value="${success_msg}" else="${fail_msg}"> - <and> - <length string="${m_linux_x86_output}" when="greater" length="0"/> - <matches pattern="x${m_linux_x86_output}*" string="x${m_linux_x86}"/> - </and> - </condition> <condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}"> <and> <length string="${m_linux_x86_64_output}" when="greater" length="0"/> @@ -167,13 +154,12 @@ <echo>-------------------------</echo> <echo>Status:</echo> <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_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_ppc64le_test} ${m_mac_test}"/> + <matches pattern="Fail" string="${m_linux_x86_64_test} ${m_linux_ppc64le_test} ${m_mac_test}"/> </condition> <fail if="m_fail" message="Failed"/> </target> @@ -237,15 +223,12 @@ <!-- 64 bit --> <antcall target="build_classes"> <param name="cp" value=".classpath_cocoa"/> - <param name="is64" value="64 bit"/> </antcall> <antcall target="build_classes"> <param name="cp" value=".classpath_gtk"/> - <param name="is64" value="64 bit"/> </antcall> <antcall target="build_classes"> <param name="cp" value=".classpath_win32"/> - <param name="is64" value="64 bit"/> </antcall> <antcall target="check_preprocessing"/> @@ -263,14 +246,8 @@ <delete dir="${tmpdir}" quiet="true"/> </target> - <target name="replace64" unless="is64"> - <antcall target="replace.64.to.32"> - <param name="replace_dir" value="${buildDir}"/> - </antcall> - </target> - <target name="build_classes"> - <echo>Building ${cp} ${is64}</echo> + <echo>Building ${cp}</echo> <delete file="${tmpdir}/copy.xml"/> <delete dir="${buildDir}"/> @@ -280,8 +257,6 @@ </xslt> <ant antfile="${tmpdir}/copy.xml" target="copy_files"/> - <antcall target="replace64"></antcall> - <javac includeantruntime="false" srcdir="${buildDir}"></javac> </target> @@ -947,28 +922,6 @@ </exec> </target> - <!-- Convert SWT 32 bit java and C source to 64 bit --> - <target name="replace.32.to.64" depends="init_build"> - <property name="replace_dir" value="${repo.src}/bundles/org.eclipse.swt"/> - <echo>Converting java files to 64 bit in ${replace_dir} project</echo> - <replace dir="${replace_dir}" includes="**/*.java" token="int /*long*/" value="long /*int*/"/> - <replace dir="${replace_dir}" includes="**/*.java" token="int[] /*long[]*/" value="long[] /*int[]*/"/> - <replace dir="${replace_dir}" includes="**/*.java" token="float /*double*/" value="double /*float*/"/> - <replace dir="${replace_dir}" includes="**/*.java" token="float[] /*double[]*/" value="double[] /*float[]*/"/> - <antcall target="init_build"/> - </target> - - <!-- Convert SWT 64 bit java and C source to 32 bit --> - <target name="replace.64.to.32" depends="init_build"> - <property name="replace_dir" value="${repo.src}/bundles/org.eclipse.swt"/> - <echo>Converting java files to 32 bit in ${replace_dir} project</echo> - <replace dir="${replace_dir}" includes="**/*.java" token="long /*int*/" value="int /*long*/"/> - <replace dir="${replace_dir}" includes="**/*.java" token="long[] /*int[]*/" value="int[] /*long[]*/"/> - <replace dir="${replace_dir}" includes="**/*.java" token="double /*float*/" value="float /*double*/"/> - <replace dir="${replace_dir}" includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/> - <antcall target="init_build"/> - </target> - <!-- ******************************************************************************** --> <!-- targets to run the builds on the Eclipse Foundation Hudson in master-slave setup --> <!-- ******************************************************************************** --> -- cgit v1.2.3
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2