From 3aca5aa105cc29fd2171fa71f9b573ccd1cff2ea Mon Sep 17 00:00:00 2001
From: Grant Gayed
Date: Thu, 20 May 2010 19:08:25 +0000
Subject: 311936 - [regression] swt-xulrunner-win32 fails to load on vanilla
 WinXP SP2

---
 bundles/org.eclipse.swt/tasks/build.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'bundles/org.eclipse.swt/tasks')

diff --git a/bundles/org.eclipse.swt/tasks/build.xml b/bundles/org.eclipse.swt/tasks/build.xml
index 4e16ccc87e..4baa8c928e 100644
--- a/bundles/org.eclipse.swt/tasks/build.xml
+++ b/bundles/org.eclipse.swt/tasks/build.xml
@@ -66,12 +66,18 @@
 
 	<target name="build_win32_x86" depends="init_build">
 		<property name="clean" value="clean"/>
-		<property name="targets" value="x86 install"/>
+		<property name="targets" value="x86 all install"/>
 		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
 			<env key="JAVA_HOME" value=""/>
 			<arg line="${targets}"/>
 			<arg line="${clean}"/>
 		</exec>
+		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
+			<env key="JAVA_HOME" value=""/>
+			<env key="BUILD_XULRUNNER" value="true"/>
+			<arg line="x86 make_xulrunner install"/>
+			<arg line="${clean}"/>
+		</exec>
 		<antcall target="refresh_fragment">
 			<param name="fragment" value="org.eclipse.swt.win32.win32.x86"/>
 		</antcall>
@@ -79,7 +85,7 @@
 
 	<target name="build_win32_x86_64" depends="init_build">
 		<property name="clean" value="clean"/>
-		<property name="targets" value="x86_64 install"/>
+		<property name="targets" value="x86_64 all install"/>
 		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
 			<env key="JAVA_HOME" value=""/>
 			<arg line="${targets}"/>
@@ -92,7 +98,7 @@
 
 	<target name="build_win32_ia64" depends="init_build">
 		<property name="clean" value="clean"/>
-		<property name="targets" value="ia64 install"/>
+		<property name="targets" value="ia64 all install"/>
 		<exec dir="${basedir}/${builddir}" executable="${basedir}/${builddir}/build.bat" failonerror="true">
 			<env key="JAVA_HOME" value=""/>
 			<arg line="${targets}"/>
-- 
cgit v1.2.3