From e34c30605d12a7999b161d37f69904e29579b768 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Wed, 26 Sep 2007 20:49:52 +0000
Subject: [PATCH] Add ICSharpCode.SharpDevelop.BuildWorker.exe to setup.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2695 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 src/Main/Base/Project/Src/Project/BuildOptions.cs | 2 +-
 src/Setup/Files.wxs                               | 4 ++++
 src/Setup/Setup.wxs                               | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Main/Base/Project/Src/Project/BuildOptions.cs b/src/Main/Base/Project/Src/Project/BuildOptions.cs
index abb845be6a..4151d06189 100644
--- a/src/Main/Base/Project/Src/Project/BuildOptions.cs
+++ b/src/Main/Base/Project/Src/Project/BuildOptions.cs
@@ -61,7 +61,7 @@ namespace ICSharpCode.SharpDevelop.Project
 		
 		public static int DefaultParallelProjectCount {
 			get {
-				return PropertyService.Get("SharpDevelop.BuildParallelProjectCount", Environment.ProcessorCount);
+				return PropertyService.Get("SharpDevelop.BuildParallelProjectCount", Environment.ProcessorCount >= 2 ? 2: 1);
 			}
 			set {
 				PropertyService.Set("SharpDevelop.BuildParallelProjectCount", value);
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index b7030722ad..1ed646239c 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -501,6 +501,10 @@
 							<Component Guid="3730EF42-5257-4EB2-9DA1-57151E5EB5A3" Id="AgaControlsDll" DiskId="1">
 								<File Source="..\..\bin\Aga.Controls.dll" Name="AGACON.DLL" Id="Aga.Controls.dll" LongName="Aga.Controls.dll" Assembly=".net" AssemblyApplication="Aga.Controls.dll" AssemblyManifest="Aga.Controls.dll" KeyPath="yes" />
 							</Component>
+							<Component Guid="28E09E1C-B1E4-4ABC-9EA8-D37255CDD9E3" Id="BuildWorkerFiles" DiskId="1">
+								<File Source="..\..\bin\ICSharpCode.SharpDevelop.BuildWorker.exe" Name="ICSHAR_1.EXE" Id="ICSharpCode.SharpDevelop.BuildWorker.exe" LongName="ICSharpCode.SharpDevelop.BuildWorker.exe" />
+								<File Source="..\..\bin\ICSharpCode.SharpDevelop.BuildWorker.exe.config" Name="ICSHAR_1.CON" Id="ICSharpCode.SharpDevelop.BuildWorker.exe.config" LongName="ICSharpCode.SharpDevelop.BuildWorker.exe.config" />
+							</Component>
 						</Directory>
 						<Directory Id="DocFolder" Name="doc">
 							<Component Guid="370DE542-C4A9-48DA-ACF8-09949CDCD808" Id="SharpDevelopDocFiles" DiskId="1">
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 88d5765eac..6115e363fe 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -173,6 +173,7 @@
 				<ComponentRef Id="SharpDevelopDocFiles"/>
 				<ComponentRef Id="ICSharpCodeBuildTasksDll"/>
 				<ComponentRef Id="BuildTasksTargetFiles"/>
+				<ComponentRef Id="BuildWorkerFiles"/>
 				<ComponentRef Id="ICSharpCodeCoreDll"/>
 				<ComponentRef Id="ICSharpCodeNRefactoryDll"/>
 				<ComponentRef Id="ICSharpCodeSharpDevelopDll"/>