Change GenBuildLogger format.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1476 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java b/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
index f102b9c2714afa17691de9e444de468e05de600f..5b16c6d6749ed4a91057cd2cf689f203c3b3e5c5 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
@@ -124,6 +124,13 @@ public class GenBuildLogger implements LogMethod {
     private void log(Object msgSource, String msg, int level) {\r
         if (msgSource instanceof Task) {\r
             this.project.log((Task)msgSource, msg, level);\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
         } else {\r
             this.project.log(msg, level);\r
         }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index facd1771a273a6f0ccfb66cb04a64ea8a4c61acf..4a7b56fc49eb13b1aad0d046ea96862cf75330cc 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -161,7 +161,7 @@ public class GlobalData {
         // CONF dir + tools definition file name\r
         //\r
         File toolsDefFile = new File(workspaceDir + File.separatorChar + toolsDefFilename);\r
         // CONF dir + tools definition file name\r
         //\r
         File toolsDefFile = new File(workspaceDir + File.separatorChar + toolsDefFilename);\r

-        EdkLog.log("Using tool definiton file [" + toolsDefFile.getPath() + "].");\r
+        EdkLog.log("Init", "Using tool definiton file [" + toolsDefFile.getPath() + "].");\r

         try {\r
             toolsDef = new ToolChainConfig(toolsDefFile);\r
         } catch (Exception e) {\r
         try {\r
             toolsDef = new ToolChainConfig(toolsDefFile);\r
         } catch (Exception e) {\r


@@ -661,8 +661,8 @@ public class GlobalData {
             }\r
             toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());\r
             toolChainInfo.normalize();\r
             }\r
             toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());\r
             toolChainInfo.normalize();\r

-            EdkLog.log("Current build tool chain information summary: ");\r
-            EdkLog.log(toolChainInfo + "");\r
+            EdkLog.log("Init", "Current build tool chain information summary: ");\r
+            EdkLog.log("Init", toolChainInfo + "");\r

         }\r
         return toolChainInfo;\r
     }\r
         }\r
         return toolChainInfo;\r
     }\r