Remove FrameworkLogger in FrameworkTasks and EdkException in GenBuild. Update EdkLog...

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 978b11fe2b9f258c70a128bf4ed5cd5055752c22..9b6251a0a26ae57a368f3ec9c88d096bd261da6e 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -35,6 +35,7 @@ import org.apache.xmlbeans.XmlObject;
 \r
 import org.tianocore.common.definitions.ToolDefinitions;\r
 import org.tianocore.common.exception.EdkException;\r
+import org.tianocore.common.logger.EdkLog;\r
 import org.tianocore.build.autogen.AutoGen;\r
 import org.tianocore.build.fpd.FpdParserTask;\r
 import org.tianocore.build.global.GlobalData;\r
@@ -231,7 +232,7 @@ public class GenBuildTask extends Ant {
             // Whether the module is built before\r
             //\r
             if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {\r
-                System.out.println("\nWARNING: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
+                EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
                 continue;\r
             } else if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
                 break;\r
@@ -256,7 +257,7 @@ public class GenBuildTask extends Ant {
                     // don't do anything if no tools found\r
                     //\r
                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r
-                        System.out.println("Warning: No build issued.  No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
+                        EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued.  No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
                         continue;\r
                     }\r
 \r
@@ -266,8 +267,8 @@ public class GenBuildTask extends Ant {
                     //\r
                     getProject().setProperty("TOOLCHAIN", toolchainList[j]);\r
 \r
-                    System.out.println("Build " + moduleId + " start >>>");\r
-                    System.out.println("Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
+                    EdkLog.log(this, "Build " + moduleId + " start >>>");\r
+                    EdkLog.log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
                     saq.push(GlobalData.getDoc(fpdModuleId));\r
 \r
                     //\r
@@ -576,7 +577,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            System.out.println("Call user-defined " + moduleId.getName() + "_build.xml");\r
+            EdkLog.log(this, "Call user-defined " + moduleId.getName() + "_build.xml");\r
             \r
             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
             antCall(antFilename, null);\r
@@ -606,7 +607,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            System.out.println("Calling user-defined " + moduleId.getName() + "_build.xml");\r
+            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
             \r
             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
             antCall(antFilename, "clean");\r
@@ -624,7 +625,7 @@ public class GenBuildTask extends Ant {
         // then call the exist BaseName_build.xml directly.\r
         //\r
         if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
-            System.out.println("Calling user-defined " + moduleId.getName() + "_build.xml");\r
+            EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
 \r
             String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
             antCall(antFilename, "cleanall");\r