Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2019-05-30 13:41:22 +0000
committerSravan Kumar Lakkimsetti2019-05-30 13:41:22 +0000
commit632f7347bdba66d255bd03680736fd4d1ed6bc4a (patch)
treed760aa91e9b82217a7aa431288603b9d3c44a2de
parent13427a0ed047f3cdc2a1518d1286ca492edb534b (diff)
downloadeclipse.platform.swt-632f7347bdba66d255bd03680736fd4d1ed6bc4a.tar.gz
eclipse.platform.swt-632f7347bdba66d255bd03680736fd4d1ed6bc4a.tar.xz
eclipse.platform.swt-632f7347bdba66d255bd03680736fd4d1ed6bc4a.zip
Bug 547333 - [32 bit][GTK2] Eclipse assembly code broke the alignment of
the stack pointer Change-Id: I26cfd88b5b4077f55295cf40dff9e36a028806e2 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml98
1 files changed, 98 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 18692aa8ac..4f9a0e555d 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -1177,4 +1177,102 @@
<replace dir="${replace_dir}" includes="**/*.java" token="double[] /*float[]*/" value="float[] /*double[]*/"/>
<antcall target="init_build"/>
</target>
+
+ <target name="new_build_with_create_file" depends="check_build_changed, check_natives_changed" if="build_changed">
+ <!-- Update the version files -->
+ <property name="increment_version_target" value="increment_version"/>
+ <antcall target="${increment_version_target}"/>
+
+ <!-- Commit the files -->
+ <antcall target="commit_sources"/>
+
+ <!-- Create tmp files if the properties are set -->
+ <antcall target="create_file_if_property_exists">
+ <param name="property" value="${build_changed}"/>
+ <param name="fileName" value="${tmphome}/build_changed.txt"/>
+ </antcall>
+ <antcall target="create_file_if_property_exists">
+ <param name="property" value="${natives_changed}"/>
+ <param name="fileName" value="${tmphome}/natives_changed.txt"/>
+ </antcall>
+ </target>
+
+ <target name="create_file_if_property_exists" if="${property}">
+ <echo>"Creating file ${fileName}"</echo>
+ <echo file="${fileName}" append="false">true</echo>
+ </target>
+
+ <target name="copy_library_src_and_create_zip" depends="init_fragment,check_sha1_changed" if="natives_changed">
+ <property name="swt.arch" value=""/>
+ <property name="project_dir" value="${basedir}/${repo.src}"/>
+ <property name="output_dir" value="${basedir}/${fragment_dir}"/>
+ <property name="build_dir" value="${basedir}/${fragment_dir}/tmpdir"/>
+ <property name="zip_file" value="${fragment}.${TAG}.zip"/>
+ <delete dir="${build_dir}" quiet="true"/>
+
+ <!-- copy the library source files -->
+ <antcall target="copy.library.src"/>
+
+ <!-- create a zip of the native source files to be sent to the build machine -->
+ <zip destfile="${build_dir}/${zip_file}" basedir="${build_dir}" excludes="${zip_file}"/>
+ </target>
+
+ <target name="build_libraries_slave" depends="init_fragment">
+ <property name="swt.arch" value=""/>
+ <property name="clean" value="clean"/>
+ <property name="targets" value="install"/>
+ <property name="libs" value="*"/>
+ <property name="src_zip_file" value="${fragment}.${TAG}.zip"/>
+ <property name="lib_zip_file" value="${fragment}.${TAG}.zip"/>
+
+ <condition property="remotebuilddir" value="c:/build" else="build/">
+ <equals arg1="${swt.os}" arg2="win32"/>
+ </condition>
+ <property name="remotetmpdir" value="${remotebuilddir}/${fragment}.${TAG}"/>
+ <property name="lib_output" value="${remotetmpdir}/libs"/>
+ <condition property="build_task" value="build_win_slave" else="build_remote_slave">
+ <equals arg1="${swt.ws}" arg2="win32"/>
+ </condition>
+
+ <!-- This target doesn't copy the src zip, it expects that the zip file is already be copied to remotebuilddir -->
+
+ <echo>${remotebuilddir}</echo>
+ <delete dir="${remotetmpdir}" quiet="false"/>
+ <mkdir dir="${remotetmpdir}"/>
+ <mkdir dir="${lib_output}"/>
+ <unzip src="${remotebuilddir}/${src_zip_file}" dest="${remotetmpdir}"/>
+ <delete file="${remotebuilddir}/${zip_file}"/>
+
+ <antcall target="${build_task}">
+ <param name="build_targets" value="${targets}"/>
+ </antcall>
+
+ <antcall target="build_gtk3"/>
+
+ <zip destfile="${remotetmpdir}/${lib_zip_file}" basedir="${lib_output}" excludes="${zip_file}" compress="false"/>
+ </target>
+
+ <target name="build_win_slave">
+ <echo>${remotetmpdir}</echo>
+ <pathconvert property="win_output_dir">
+ <path location="${lib_output}"></path>
+ </pathconvert>
+ <exec dir="${remotetmpdir}" executable="${remotetempdir}/build.bat" failonerror="true">
+ <env key="OUTPUT_DIR" value="${win_output_dir}"/>
+ <arg line="${build_targets}"/>
+ <arg line="${clean}"/>
+ </exec>
+ </target>
+
+ <target name="build_remote_slave">
+ <echo>${remotetmpdir}</echo>
+ <exec dir="${remotetmpdir}" executable="sh" failonerror="true">
+ <arg line="build.sh"/>
+ <env key="GTK_VERSION" value="${gtk_version}"/>
+ <env key="MODEL" value="${swt.arch}"/>
+ <env key="OUTPUT_DIR" value="${lib_output}"/>
+ <arg line="${build_targets}"/>
+ <arg line="${clean}"/>
+ </exec>
+ </target>
</project>

Back to the top