From: Marko Grönroos <magi@iki.fi>
Date: Thu, 17 Sep 2009 14:10:00 +0000 (+0000)
Subject: Accidentally compiled the widgetsets both sequentially and in parallel. For #3368.
X-Git-Tag: 6.7.0.beta1~2467^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=461d39191731f831a976f09db64615df7ad3460e;p=vaadin-framework.git

Accidentally compiled the widgetsets both sequentially and in parallel. For #3368.

svn changeset:8839/svn branch:6.1
---

diff --git a/build/build.xml b/build/build.xml
index 657809ad20..188ad458fe 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -918,10 +918,16 @@
 		<echo>Compiled ColorPickerWidgetSet</echo>
 	</target>
 
-    <!-- Builds the client-side engine, i.e., the widgetsets. -->
-	<target name="compile-client-side-sequential" depends="compile-widgetset-default, compile-widgetset-portal-default, compile-widgetset-reserver, compile-widgetset-sampler, compile-widgetset-colorpicker, compile-widgetset-coverflow" unless="build.parallel">
-		<!-- Building the widgetsets is currently done sequentially, because
-		     parallel compilation takes too much memory for most machines. -->
+    <!-- Builds the client-side engine, i.e., the widgetsets sequentially. -->
+	<target name="compile-client-side-sequential" unless="build.parallel">
+		<echo>Compiling widget sets sequentially.</echo>
+        <!-- We can't call these with 'depends' because of the 'unless' specifier. -->
+		<subant antfile="build.xml" target="compile-widgetset-default" inheritall="true" buildpath="build" />
+		<subant antfile="build.xml" target="compile-widgetset-portal-default" inheritall="true" buildpath="build" />
+		<subant antfile="build.xml" target="compile-widgetset-reserver" inheritall="true" buildpath="build" />
+		<subant antfile="build.xml" target="compile-widgetset-sampler" inheritall="true" buildpath="build" />
+		<subant antfile="build.xml" target="compile-widgetset-colorpicker" inheritall="true" buildpath="build" />
+		<subant antfile="build.xml" target="compile-widgetset-coverflow" inheritall="true" buildpath="build" />
 	</target>
 
 	<!-- Builds the client-side engine, i.e., the widgetsets in parallel. -->