From 8b424ca50d599ba09fc91ef93cf0b5b34ab7cb13 Mon Sep 17 00:00:00 2001
From: Trivalik_cp <42497cfff885d3ca0e6fda54fb6262dd42101bd5sx56jUzf>
Date: Thu, 23 Jun 2011 18:22:01 +0000
Subject: [PATCH] enable error log for basetooltask optimize nasm.cs

---
 .../Cosmos.Build.MSBuild/BaseToolTask.cs      | 26 +++++++------------
 source2/Build/Cosmos.Build.MSBuild/NAsm.cs    |  4 +--
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/source2/Build/Cosmos.Build.MSBuild/BaseToolTask.cs b/source2/Build/Cosmos.Build.MSBuild/BaseToolTask.cs
index 5aeac20ea..8db62cedb 100644
--- a/source2/Build/Cosmos.Build.MSBuild/BaseToolTask.cs
+++ b/source2/Build/Cosmos.Build.MSBuild/BaseToolTask.cs
@@ -5,6 +5,7 @@ using System.Text;
 using Microsoft.Build.Utilities;
 using System.Diagnostics;
 using MessageImportance = Microsoft.Build.Framework.MessageImportance;
+using Microsoft.Build.Framework;
 
 namespace Cosmos.Build.MSBuild
 {
@@ -47,39 +48,30 @@ namespace Cosmos.Build.MSBuild
 				xProcess.BeginErrorReadLine();
 				xProcess.BeginOutputReadLine();
 				xProcess.WaitForExit(15 * 60 * 1000); // wait 15 minutes
-				if (xProcess.ExitCode != 0)
-				{
-					if (!xProcess.HasExited)
-					{
+				if (xProcess.ExitCode != 0) {
+					if (!xProcess.HasExited) {
 						xProcess.Kill();
 						Log.LogError("{0} timed out.", name);
 					}
-					else
-					{
+					else {
 						Log.LogError("Error occurred while invoking {0}.", name);
 					}
-					
-					return false;
 				}
 				WriteType typ;
-				foreach (var xError in mErrors)
-				{
+				foreach (var xError in mErrors) {
 					string error = xError;
-					if(ExtendLineError(xProcess.ExitCode, ref error, out typ))
-					{
+					if(ExtendLineError(xProcess.ExitCode, ref error, out typ)) {
 						Logs(typ, error);
 					}
 				}
-				foreach (var xOutput in mOutput)
-				{
+				foreach (var xOutput in mOutput) {
 					string output = xOutput;
-					if (ExtendLineError(xProcess.ExitCode, ref output, out typ))
-					{
+					if (ExtendLineError(xProcess.ExitCode, ref output, out typ)) {
 						Logs(typ, output);
 					}
 				}
+				return xProcess.ExitCode == 0;
 			}
-			return true;
 		}
 
 		private List<string> mErrors;
diff --git a/source2/Build/Cosmos.Build.MSBuild/NAsm.cs b/source2/Build/Cosmos.Build.MSBuild/NAsm.cs
index 6037cb1c2..a4346221a 100644
--- a/source2/Build/Cosmos.Build.MSBuild/NAsm.cs
+++ b/source2/Build/Cosmos.Build.MSBuild/NAsm.cs
@@ -89,8 +89,8 @@ namespace Cosmos.Build.MSBuild
 						typ = WriteType.Warning;
 					uint lineNumber = uint.Parse(split[1]);
 					errorMessage = file + " Line: " + lineNumber + " Code: " + GetLine(InputFile, lineNumber).Trim();
-					this.BuildEngine.LogMessageEvent(new BuildMessageEventArgs(errorMessage,"","",MessageImportance.High));
-
+					this.BuildEngine.LogMessageEvent(
+						new BuildMessageEventArgs(errorMessage, string.Empty, string.Empty, MessageImportance.High));
 				}
 			}
 			catch (Exception)