From deea659bad8bc606d06cb321c0a33c56503bb6f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marko=20Gr=C3=B6nroos?= <magi@iki.fi>
Date: Thu, 17 Sep 2009 13:43:00 +0000
Subject: [PATCH] Build parallel only if build.parallel is enabled.

svn changeset:8837/svn branch:6.1
---
 build/build.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index f7694e2327..657809ad20 100644
--- 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" />
-- 
2.39.5