Change GenBuildLogger format.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / global / GenBuildLogger.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java b/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
index 9bc3f2d176a80d91e889a2c9ccf475bfde4327b4..5b16c6d6749ed4a91057cd2cf689f203c3b3e5c5 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Vector;\r
 \r
 import org.apache.tools.ant.Project;\r
+import org.apache.tools.ant.Task;\r
 \r
 import org.tianocore.common.logger.EdkLog;\r
 import org.tianocore.common.logger.LogMethod;\r
@@ -72,40 +73,40 @@ public class GenBuildLogger implements LogMethod {
         //\r
         switch (msgLevel) {\r
         case EdkLog.EDK_ALWAYS:\r
-            this.project.log(msg, Project.MSG_INFO);\r
+            log(msgSource, msg, Project.MSG_INFO);\r
             break;\r
         case EdkLog.EDK_ERROR:\r
             if (flag) {\r
-                this.project.log(msg, Project.MSG_ERR);\r
+                log(msgSource, msg, Project.MSG_ERR);\r
             } else {\r
-                this.project.log(msg, Project.MSG_ERR);\r
+                log(msgSource, msg, Project.MSG_ERR);\r
                 v.add(msg);\r
             }\r
             break;\r
         case EdkLog.EDK_WARNING:\r
             if (flag) {\r
-                this.project.log(msg, Project.MSG_WARN);\r
+                log(msgSource, msg, Project.MSG_WARN);\r
             } else {\r
                 v.add(msg);\r
             }\r
             break;\r
         case EdkLog.EDK_INFO:\r
             if (flag) {\r
-                this.project.log(msg, Project.MSG_INFO);\r
+                log(msgSource, msg, Project.MSG_INFO);\r
             } else {\r
                 v.add(msg);\r
             }\r
             break;\r
         case EdkLog.EDK_VERBOSE:\r
             if (flag) {\r
-                this.project.log(msg, Project.MSG_VERBOSE);\r
+                log(msgSource, msg, Project.MSG_VERBOSE);\r
             } else {\r
                 v.add(msg);\r
             }\r
             break;\r
         case EdkLog.EDK_DEBUG:\r
             if (flag) {\r
-                this.project.log(msg, Project.MSG_DEBUG);\r
+                log(msgSource, msg, Project.MSG_DEBUG);\r
             } else {\r
                 v.add(msg);\r
             }\r
@@ -119,4 +120,19 @@ public class GenBuildLogger implements LogMethod {
         //\r
 \r
     }\r
+    \r
+    private void log(Object msgSource, String msg, int level) {\r
+        if (msgSource instanceof Task) {\r
+            this.project.log((Task)msgSource, msg, level);\r
+        } else if (msgSource instanceof String){\r
+            \r
+            //\r
+            // Pad 12 space to keep message \r
+            //\r
+            msg = msg.replaceAll("\n", "\n            ");\r
+            this.project.log(String.format("%12s", "[" + msgSource + "] ") + msg, level);\r
+        } else {\r
+            this.project.log(msg, level);\r
+        }\r
+    }\r
 }
\ No newline at end of file