diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-11 11:45:19 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-11 11:49:04 -0400 |
| commit | 0e8780fecdad08e13acf40e49af437762eff1854 (patch) | |
| tree | 19cacc07436d438904069e79c5298104fa0560ba /bundles/org.eclipse.swt/buildSWT.xml | |
| parent | 650deb026c998b07523a6424f11db72ac0bd1b3a (diff) | |
| download | eclipse.platform.swt-0e8780fecdad08e13acf40e49af437762eff1854.tar.gz eclipse.platform.swt-0e8780fecdad08e13acf40e49af437762eff1854.tar.xz eclipse.platform.swt-0e8780fecdad08e13acf40e49af437762eff1854.zip | |
finish support of 64-bit XULRunner on win32
Diffstat (limited to 'bundles/org.eclipse.swt/buildSWT.xml')
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 1cdd3b9544..4aa044c049 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -147,7 +147,7 @@ <param name="fragment" value="org.eclipse.swt.win32.win32.x86"/> </antcall> <antcall target="check_fragment_libraries"> - <param name="library_count" value="4"/> + <param name="library_count" value="5"/> <param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/> </antcall> <antcall target="check_fragment_libraries"> @@ -165,7 +165,7 @@ <target name="check_fragment_libraries" depends="get_version"> <echo>Checking ${fragment}</echo> <property name="checkdir" value="~/build/check_libraries"/> - <property name="library_count" value="127"/> + <property name="library_count" value="128"/> <property name="fragment" value=""/> <fileset id="match" dir="${repo.bin}/bundles/${fragment}"> <filename regex="[0-9][0-9][0-9][0-9]."/> @@ -1031,21 +1031,14 @@ <arg line="${targets}"/> <arg line="${clean}"/> </exec> - <condition property="should_build_xulrunner" value="true"> - <and> - <equals arg1="${swt.ws}" arg2="win32"/> - <equals arg1="${swt.arch}" arg2="x86"/> - </and> + <condition property="xulrunner_target" value="make_xulrunner64" else="make_xulrunner"> + <equals arg1="${swt.arch}" arg2="x86_64"/> </condition> - <antcall target="build_local_win_xulrunner"/> - </target> - - <target name="build_local_win_xulrunner" if="should_build_xulrunner"> <exec dir="${build_dir}" executable="cmd" failonerror="true"> <env key="JAVA_HOME" value=""/> <env key="BUILD_XULRUNNER" value="true"/> <env key="OUTPUT_DIR" value="${win_output_dir}"/> - <arg line="/c '${build_dir}/${build_file}' x86 make_xulrunner install ${clean}"/> + <arg line="/c '${build_dir}/${build_file}' ${swt.arch} ${xulrunner_target} install ${clean}"/> </exec> </target> |