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 657809ad20f08d750bda92f75c1fe477314919a9..188ad458fe16cb00200c54c099c2de56a9d784f4 100644 (file)
--- 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. -->