Build parallel only if build.parallel is enabled.

svn changeset:8837/svn branch:6.1

diff --git a/build/build.xml b/build/build.xml
index f7694e23270f4d2bfd2df19a4457ab53d111c1a2..657809ad20f08d750bda92f75c1fe477314919a9 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -918,8 +918,14 @@
                <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. -->
+       </target>
+
        <!-- Builds the client-side engine, i.e., the widgetsets in parallel. -->
-       <target name="compile-client-side">
+       <target name="compile-client-side-parallel" if="build.parallel">
                <echo>Compiling widget sets in parallel.</echo>
                <parallel threadsperprocessor="1">
                        <subant antfile="build.xml" target="compile-widgetset-default" inheritall="true" buildpath="build" />
@@ -931,6 +937,10 @@
                </parallel>
        </target>
 
+    <!-- Build either sequentially or in parallel,   -->
+       <!-- depending on the 'build-parallel' property. -->
+       <target name="compile-client-side" depends="compile-client-side-sequential, compile-client-side-parallel"/>
+
        <!-- Definitions for building local components, i.e., not for an installation package. -->
        <target name="init-nonpackage" depends="init-platform">
                <property file="build/VERSION.properties" />