Add two definitions to ToolDefinitions. Enhance EdkLog and GenBuildLogger. GenBuildLo...

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 04cf84c04fea1a42b7679ef070c9a84729725646..ea5657cdf9ec89ca0320f08e9a2ecb1e23aff1e8 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -26,10 +26,12 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;\r
 import org.tianocore.build.fpd.FpdParserForThread;\r
 import org.tianocore.build.fpd.FpdParserTask;\r
+import org.tianocore.build.global.GenBuildLogger;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.toolchain.ConfigReader;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
 import org.tianocore.common.definitions.ToolDefinitions;\r
+import org.tianocore.common.logger.EdkLog;\r
 \r
 /**\r
   <p>\r
@@ -103,6 +105,13 @@ public class FrameworkBuildTask extends Task{
     private String type = "all";\r
     \r
     public void execute() throws BuildException {\r
+        //\r
+        // set Logger\r
+        //\r
+        GenBuildLogger logger = new GenBuildLogger(getProject());\r
+        EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
+        EdkLog.setLogger(logger);\r
+\r
         //\r
         // Seach build.xml -> .FPD -> .MSA file\r
         //\r
@@ -200,7 +209,7 @@ public class FrameworkBuildTask extends Task{
                 fpdParserForThread.setType(type);\r
                 fpdParserForThread.setProject(getProject());\r
                 fpdParserForThread.setFpdFile(buildFile);\r
-                fpdParserForThread.execute();\r
+                fpdParserForThread.perform();\r
                 return ;\r
             }\r
             \r
@@ -208,7 +217,7 @@ public class FrameworkBuildTask extends Task{
             fpdParserTask.setType(type);\r
             fpdParserTask.setProject(getProject());\r
             fpdParserTask.setFpdFile(buildFile);\r
-            fpdParserTask.execute();\r
+            fpdParserTask.perform();\r
             \r
             //\r
             // If cleanall delete the Platform_build.xml\r
@@ -239,7 +248,7 @@ public class FrameworkBuildTask extends Task{
             }\r
             genBuildTask.setProject(getProject());\r
             genBuildTask.setMsaFile(buildFile);\r
-            genBuildTask.execute();\r
+            genBuildTask.perform();\r
         }\r
     }\r
     \r
@@ -268,7 +277,6 @@ public class FrameworkBuildTask extends Task{
             String name = (String)piter.next();\r
             originalProperties.put(new String(name), new String((String)allProperties.get(name)));\r
         }\r
-        \r
     }\r
 \r
     private File intercommuniteWithUser(){\r
@@ -370,12 +378,12 @@ public class FrameworkBuildTask extends Task{
                 activePlatform = str;\r
             }\r
             \r
-            str = getValue("MULTIPLE_THREAD", targetFileInfo);\r
+            str = getValue(ToolDefinitions.TARGET_KEY_MULTIPLE_THREAD, targetFileInfo);\r
             if (str != null && str.trim().equalsIgnoreCase("Enable")) {\r
                 multithread = true;\r
             }\r
             \r
-            str = getValue("MAX_CONCURRENT_THREAD_NUMBER", targetFileInfo);\r
+            str = getValue(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo);\r
             if (str != null ) {\r
                 try {\r
                     int threadNum = Integer.parseInt(str);\r