* ConsoleLogger.cs: Honor LoggerVerbosity.Quiet .

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index 78c0aed021d1359ad658611fa620107ef87fe454..6642d67ebf759936a52e8d1f1fb8727b3fbb291f 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-24  Ankit Jain  <jankit@novell.com>
+
+       * ConsoleLogger.cs: Honor LoggerVerbosity.Quiet .
+
 2010-07-22  Ankit Jain  <jankit@novell.com>
 
        * ConsoleLogger.cs: Add support for parameter 'NoItemAndPropertyList'.

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
index f4315d65be88e30a1821e838d7d4d71f2b6dc954..403978106526622f3812dac063519a52f34033e5 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs
@@ -213,9 +213,11 @@ namespace Microsoft.Build.BuildEngine {
                
                public void BuildStartedHandler (object sender, BuildStartedEventArgs args)
                {
-                       WriteLine (String.Empty);
-                       WriteLine (String.Format ("Build started {0}.", args.Timestamp));
-                       WriteLine ("__________________________________________________");
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal)) {
+                               WriteLine (String.Empty);
+                               WriteLine (String.Format ("Build started {0}.", args.Timestamp));
+                               WriteLine ("__________________________________________________");
+                       }
                        buildStart = args.Timestamp;
 
                        PushEvent (args);
@@ -223,6 +225,11 @@ namespace Microsoft.Build.BuildEngine {
                
                public void BuildFinishedHandler (object sender, BuildFinishedEventArgs args)
                {
+                       if (!IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal)) {
+                               PopEvent ();
+                               return;
+                       }
+
                        if (args.Succeeded == true && !projectFailed) {
                                WriteLine ("Build succeeded.");
                        } else {
@@ -280,13 +287,15 @@ namespace Microsoft.Build.BuildEngine {
 
                public void ProjectStartedHandler (object sender, ProjectStartedEventArgs args)
                {
-                       SetColor (eventColor);
-                       WriteLine (String.Format ("Project \"{0}\" ({1} target(s)):", args.ProjectFile,
-                                               String.IsNullOrEmpty (args.TargetNames) ? "default" : args.TargetNames));
-                       ResetColor ();
-                       WriteLine (String.Empty);
-                       DumpProperties (args.Properties);
-                       DumpItems (args.Items);
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal)) {
+                               SetColor (eventColor);
+                               WriteLine (String.Format ("Project \"{0}\" ({1} target(s)):", args.ProjectFile,
+                                                       String.IsNullOrEmpty (args.TargetNames) ? "default" : args.TargetNames));
+                               ResetColor ();
+                               WriteLine (String.Empty);
+                               DumpProperties (args.Properties);
+                               DumpItems (args.Items);
+                       }
                        PushEvent (args);
                }
                
@@ -310,25 +319,28 @@ namespace Microsoft.Build.BuildEngine {
                
                public void TargetStartedHandler (object sender, TargetStartedEventArgs args)
                {
-                       indent++;
-                       SetColor (eventColor);
-                       WriteLine (String.Format ("Target {0}:",args.TargetName));
-                       ResetColor ();
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal)) {
+                               indent++;
+                               SetColor (eventColor);
+                               WriteLine (String.Format ("Target {0}:",args.TargetName));
+                               ResetColor ();
+                       }
                        PushEvent (args);
                }
                
                public void TargetFinishedHandler (object sender, TargetFinishedEventArgs args)
                {
-                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Detailed) || !args.Succeeded) {
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Detailed) ||
+                                       (!args.Succeeded && IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal))) {
                                SetColor (eventColor);
                                WriteLine (String.Format ("Done building target \"{0}\" in project \"{1}\".{2}",
                                        args.TargetName, args.ProjectFile,
                                        args.Succeeded ? String.Empty : "-- FAILED"));
                                ResetColor ();
+                               WriteLine (String.Empty);
                        }
                        indent--;
 
-                       WriteLine (String.Empty);
                        PopEvent ();
                }
                
@@ -346,7 +358,8 @@ namespace Microsoft.Build.BuildEngine {
                public void TaskFinishedHandler (object sender, TaskFinishedEventArgs args)
                {
                        indent--;
-                       if (this.verbosity == LoggerVerbosity.Detailed || !args.Succeeded) {
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Detailed) ||
+                                       (!args.Succeeded && IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal))) {
                                SetColor (eventColor);
                                if (args.Succeeded)
                                        WriteLine (String.Format ("Done executing task \"{0}\"", args.TaskName));
@@ -373,7 +386,7 @@ namespace Microsoft.Build.BuildEngine {
                public void WarningHandler (object sender, BuildWarningEventArgs args)
                {
                        string msg = FormatWarningEvent (args);
-                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Normal)) {
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Quiet)) {
                                SetColor (warningColor);
                                WriteLineWithoutIndent (msg);
                                ResetColor ();
@@ -391,7 +404,7 @@ namespace Microsoft.Build.BuildEngine {
                public void ErrorHandler (object sender, BuildErrorEventArgs args)
                {
                        string msg = FormatErrorEvent (args);
-                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Minimal)) {
+                       if (IsVerbosityGreaterOrEqual (LoggerVerbosity.Quiet)) {
                                SetColor (errorColor);
                                WriteLineWithoutIndent (msg);
                                ResetColor ();