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

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

diff --git a/Tools/Source/Common/org/tianocore/common/logger/EdkLog.java b/Tools/Source/Common/org/tianocore/common/logger/EdkLog.java
index cfa7d53e4a619492228377fa46e3415edb853bf3..6b3ed9547196642d02593b2defbb040fdd820ec7 100644 (file)
--- a/Tools/Source/Common/org/tianocore/common/logger/EdkLog.java
+++ b/Tools/Source/Common/org/tianocore/common/logger/EdkLog.java
@@ -59,6 +59,18 @@ public class EdkLog {
             logger.putMessage(null, EDK_INFO, message);\r
         }\r
     }\r
+    \r
+    public static void log(Object o, int level, String message) {\r
+        if (level <= logLevel) {\r
+            logger.putMessage(o, level, message);\r
+        }\r
+    }\r
+\r
+    public static void log(Object o, String message) {\r
+        if (EDK_INFO <= logLevel) {\r
+            logger.putMessage(o, EDK_INFO, message);\r
+        }\r
+    }\r
 \r
     public static void flushLogToFile(File file) {\r
         logger.flushToFile(file);\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
index d73ea6a9293d43d4b322d3885c66a82897e1ce3c..672e712b3e91d43d1001a9466d6e4f826888f476 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
@@ -63,12 +63,7 @@ public class CreateMtFileTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "createmtfile");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -109,20 +104,20 @@ public class CreateMtFileTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.outputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.outputFile)).getName());\r
             revl = runner.execute();\r
 \r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "CreateMtFile succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "CreateMtFile succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("CreateMtFile failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
index 8f8ea2eb25782cf83af082d9d9e8ca3fb2ce891b..0f82002bb503a9bbbc9cec73bdfbe9be172b2241 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
@@ -59,12 +59,7 @@ public class EfiCompressTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "eficompress");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -105,8 +100,8 @@ public class EfiCompressTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
 \r
             revl = runner.execute();\r
 \r
@@ -114,12 +109,12 @@ public class EfiCompressTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "EfiCompress succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "EfiCompress succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("EfiCompress failed!");\r
 \r
             }\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
index 0eba56ea839bd7480bcb06879070bc0811e377ec..7eb987854a2e4ad2dc8d3639ce2ce9ec9804e55e 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiRomTask.java
@@ -112,12 +112,7 @@ public class EfiRomTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "efirom");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -163,8 +158,8 @@ public class EfiRomTask extends Task implements EfiDefine {
             }\r
         }\r
 \r
-        EdkLog.log(EdkLog.EDK_VERBOSE, argList.toString().replaceAll(",",""));\r
-        EdkLog.log(EdkLog.EDK_INFO, " ");\r
+        EdkLog.log(this, EdkLog.EDK_VERBOSE, argList.toString().replaceAll(",",""));\r
+        EdkLog.log(this, EdkLog.EDK_INFO, " ");\r
 \r
         //\r
         // lauch the program\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
index ce0939f4b15a8844850dfd16f22e90d66f9f10ef..44c5b9c6be73e64cbd8ffd437b589c1dd0bc88e0 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
@@ -142,12 +142,6 @@ public class FlashMapTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "flashmap");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -198,13 +192,13 @@ public class FlashMapTask extends Task implements EfiDefine {
             //\r
             // log command line string.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, cmdProc.getOutputStream().toString());\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.flashDefFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, cmdProc.getOutputStream().toString());\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.flashDefFile)).getName());\r
             if (exitCode != 0) {\r
                 int len = cmdOut.read(buf, 0, 1024);\r
-                EdkLog.log(EdkLog.EDK_INFO, new String(buf, 0, len));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, new String(buf, 0, len));\r
             } else {\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "FlashMap succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "FlashMap succeeded!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FrameworkLogger.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FrameworkLogger.java
deleted file mode 100644 (file)
index 0c4e40c..0000000
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FrameworkLogger.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-Module Name:\r
-  FrameworkLogger.java\r
-\r
-Abstract:\r
-\r
---*/\r
-\r
-package org.tianocore.framework.tasks;\r
-\r
-import org.apache.tools.ant.Project;\r
-import java.io.File;\r
-import org.tianocore.common.logger.LogMethod;\r
-\r
-class FrameworkLogger implements LogMethod {\r
-    private Project project;\r
-    private String  titleName;\r
-    public FrameworkLogger(Project project, String taskName) {\r
-        this.project = project;\r
-        this.titleName = taskName;\r
-    }\r
-\r
-    public void putMessage(Object msgSource, int msgLevel, String msg) {\r
-        String frameworkMsg = " [" + this.titleName + "] " + msg;\r
-        this.project.log(frameworkMsg, Project.MSG_INFO);\r
-    }\r
-    \r
-    public void flushToFile(File file) {\r
-    }\r
-}
\ No newline at end of file

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
index 5ccf53570ab034323fc85193685fc0204a0f0d3b..d9eafacc37f40981e33c5b252d45eb5f1880ef04 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenAcpiTableTask.java
@@ -60,12 +60,6 @@ public class GenAcpiTableTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "genacpitable");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -105,20 +99,20 @@ public class GenAcpiTableTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
             revl = runner.execute();\r
 \r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "GenAcpiTable succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenAcpiTable succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("GenAcpiTable failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java
index 591ec032f580a966a1e43956e16c36c7e351cc5f..12def7c898a93779b5a3176ac0a3a99dd422abe8 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCapsuleHdrTask.java
@@ -91,12 +91,6 @@ public class GenCapsuleHdrTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "gencapsulehdr");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -138,20 +132,20 @@ public class GenCapsuleHdrTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(scriptFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(scriptFile)).getName());\r
             revl = runner.execute();\r
 \r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "GenCapsuleHdr succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenCapsuleHdr succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_ERROR, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_ERROR, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("GenCapsuleHdr failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
index b41e7f8a0a9b11193c80c932ae0f806425a7c773..b7c5b7f8a06a057952b5007d3e4bc3328c037855 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -124,13 +124,6 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
 \r
         String            ffsSuffix = "";\r
         String            outputPath = "";\r
-        Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "genFfs");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
         \r
         //\r
         //  Get Fraemwork_Tools_Path\r
@@ -751,7 +744,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         FfsHeader         ffsHeader = new FfsHeader();  \r
         FfsHeader         orgFfsHeader = new FfsHeader();\r
            \r
-        EdkLog.log(EdkLog.EDK_INFO, ffsFile.getName());\r
+        EdkLog.log(this, EdkLog.EDK_INFO, ffsFile.getName());\r
       \r
         try {\r
             //\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
index a0743c6307909c3c20e2c12e12b051751170ae1c..9f0b743a471e5f5b62c22b5d567bcd069911c02c 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenTeImageTask.java
@@ -79,12 +79,6 @@ public class GenTeImageTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, toolName.toLowerCase());\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -126,8 +120,8 @@ public class GenTeImageTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
 \r
             revl = runner.execute();\r
 \r
@@ -135,12 +129,12 @@ public class GenTeImageTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "GenTeImage succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenTeImage succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
                 throw new BuildException("GenTeImage failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index f41bcfc6d3ae480a58e562d457c30b356e5d6101..76ab8e071500cd7177d109c6be553283535dd651 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -16,15 +16,11 @@ package org.tianocore.framework.tasks;
 \r
 import java.io.File;\r
 import java.io.FileReader;\r
-import java.io.FileWriter;\r
 import java.io.IOException;\r
 import java.io.LineNumberReader;\r
 import java.util.ArrayList;\r
-import java.util.HashSet;\r
 import java.util.Iterator;\r
 import java.util.List;\r
-import java.util.Set;\r
-import java.util.StringTokenizer;\r
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r
@@ -75,9 +71,6 @@ public class MakeDeps extends Task {
 \r
         Project prj  = this.getOwningTarget().getProject();\r
         String  toolPath = prj.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
-        FrameworkLogger logger = new FrameworkLogger(prj, "makedeps");\r
-        EdkLog.setLogLevel(prj.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
 \r
         ///\r
         /// compose full tool path\r
@@ -145,7 +138,7 @@ public class MakeDeps extends Task {
         runner.setAntRun(prj);\r
         runner.setCommandline(cmd.getCommandline());\r
 \r
-        EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmd.getCommandline()));\r
+        EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmd.getCommandline()));\r
 \r
         int result = 0;\r
         try {\r
@@ -155,7 +148,7 @@ public class MakeDeps extends Task {
         }\r
 \r
         if (result != 0) {\r
-            EdkLog.log(EdkLog.EDK_INFO, "MakeDeps failed!");\r
+            EdkLog.log(this, EdkLog.EDK_INFO, "MakeDeps failed!");\r
             throw new BuildException("MakeDeps: failed to generate dependency file!");\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
index 7309d77903403b8339fbc6e9c8d1bdf44acd8d34..e01b0404a8a6363ad2fd092c4ecfc1a09416cea7 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
@@ -70,12 +70,6 @@ public class ModifyInfTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "modifyinftask");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -120,20 +114,20 @@ public class ModifyInfTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFVInfFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFVInfFile)).getName());\r
             revl = runner.execute();\r
 \r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "ModifyInfTask succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "ModifyInfTask succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("ModifyInfTask failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
index 4e545e0012ec0ac658e887c5fcf5223fcd727ea7..d7dfc4193ba132300919986dfdd4f2e4593cb04c 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/PeiReBaseTask.java
@@ -73,12 +73,6 @@ public class PeiReBaseTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, toolName.toLowerCase());\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
 \r
         //\r
         // absolute path of efi tools\r
@@ -130,8 +124,8 @@ public class PeiReBaseTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, this.inputFileName);\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, this.inputFileName);\r
 \r
             revl = runner.execute();\r
 \r
@@ -139,12 +133,12 @@ public class PeiReBaseTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "PeiReBase succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "PeiReBase succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("PeiReBase failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java
index 28d5e87acdf157a66322fdfb95e6a9751d54ab0f..1bcfacf2f0d5c73fd6e20047de10d5b0b3c4a301 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecApResetVectorFixupTask.java
@@ -67,12 +67,6 @@ public class SecApResetVectorFixupTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
         //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "secapresetvectorfixup");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-        //\r
         // absolute path of efi tools\r
         //\r
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
@@ -112,8 +106,8 @@ public class SecApResetVectorFixupTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.fvInputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.fvInputFile)).getName());\r
 \r
             revl = runner.execute();\r
 \r
@@ -121,12 +115,12 @@ public class SecApResetVectorFixupTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "SecApResetVectorFixup succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "SecApResetVectorFixup succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("SecApResetVectorFixup failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java
index 8f46ff916f68806fb09dc2339a0cca55d542b353..3e2dd1a8ba5bce384782d54b447c4b35731b5a40 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SecFixupTask.java
@@ -69,13 +69,7 @@ public class SecFixupTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, toolName\r
-                .toLowerCase());\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -117,7 +111,7 @@ public class SecFixupTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
 \r
             revl = runner.execute();\r
 \r
@@ -125,12 +119,12 @@ public class SecFixupTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "SecFixup succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "SecFixup succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
                 throw new BuildException("SecFixup failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
index a71eb013239fd4002f0a67b6646daf1d61b087b5..01abde7da0ee2ec90bc64db93053e07c3d21d590 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
@@ -58,13 +58,6 @@ public class SplitfileTask extends Task implements EfiDefine {
 \r
         Project project = this.getOwningTarget().getProject();\r
 \r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "splitfile");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
-\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -99,19 +92,19 @@ public class SplitfileTask extends Task implements EfiDefine {
             runner.setAntRun(project);\r
             runner.setCommandline(cmdline.getCommandline());\r
 \r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "SplitFile succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "SplitFile succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("SplitFile failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
index 107575c839829d8c6ca3e7fb12f589d1c4d6032f..14488be8fc81a64f02580f111f1b26012366b66f 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
@@ -60,12 +60,7 @@ public class StripTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "strip");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -106,8 +101,8 @@ public class StripTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
 \r
             revl = runner.execute();\r
 \r
@@ -115,12 +110,12 @@ public class StripTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "Strip succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "Strip succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("Strip failed!");\r
             }\r
         } catch (Exception e) {\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
index d99f2399dc082ac5f2e15943a8b9ce4417e0e95f..198ba5eeefe9254c605514eb8c2d51a7fff66183 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
@@ -167,7 +167,6 @@ public class VfrCompilerTask extends Task implements EfiDefine {
         } else {\r
             command = toolPath + "/" + "VfrCompile";\r
         }\r
-        List<Object> includePath = new ArrayList<Object>();     \r
         String incPath = "";        \r
 \r
         int count = includepathList.size();    \r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java
index ccba47d4a60b8f06cdb966dd56b974e094a10375..a6df4949f5dbfcb0854ab70eac5e3a9c3a0e8132 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ZeroDebugDataTask.java
@@ -60,12 +60,7 @@ public class ZeroDebugDataTask extends Task implements EfiDefine {
     public void execute() throws BuildException {\r
 \r
         Project project = this.getOwningTarget().getProject();\r
-        //\r
-        // set Logger\r
-        //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "zerodebugdata");\r
-        EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
-        EdkLog.setLogger(logger);\r
+\r
         //\r
         // absolute path of efi tools\r
         //\r
@@ -106,8 +101,8 @@ public class ZeroDebugDataTask extends Task implements EfiDefine {
             //\r
             // Set debug log information.\r
             //\r
-            EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
-            EdkLog.log(EdkLog.EDK_INFO, (new File(this.peFile)).getName());\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+            EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.peFile)).getName());\r
 \r
             revl = runner.execute();\r
 \r
@@ -115,12 +110,12 @@ public class ZeroDebugDataTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "ZeroDebugData succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "ZeroDebugData succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+                EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("ZeroDebugData failed!");\r
 \r
             }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
index ed94da38ed2bc0a3a51a0e5b3049e6a41ed8cfcf..702c28fee765b2dbcf4bd7a94214ef2802a8d4a5 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -26,6 +26,7 @@ import org.tianocore.build.global.GlobalData;
 import org.tianocore.build.global.SurfaceAreaQuery;\r
 import org.tianocore.build.id.FpdModuleIdentification;\r
 import org.tianocore.common.definitions.EdkDefinitions;\r
+import org.tianocore.common.logger.EdkLog;\r
 import org.w3c.dom.Document;\r
 import org.w3c.dom.Element;\r
 \r
@@ -129,7 +130,7 @@ public class FfsProcess {
         // Otherwise report warning message\r
         //\r
         if (buildType == null) {\r
-            System.out.println("Warning: this module doesn't specify a FfsFormatKey. ");\r
+            EdkLog.log(EdkLog.EDK_WARNING, "Warning: this module doesn't specify a FfsFormatKey. ");\r
         } else {\r
             throw new BuildException("Can't find the FfsFormatKey [" + buildType + "] attribute in the FPD file!");            \r
         }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index ea5657cdf9ec89ca0320f08e9a2ecb1e23aff1e8..9d68419aa8bc24365f7a037d55bca59a6a3286ad 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -15,6 +15,7 @@ package org.tianocore.build;
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
+import java.io.IOException;\r
 import java.io.InputStreamReader;\r
 import java.util.Hashtable;\r
 import java.util.Iterator;\r
@@ -24,6 +25,10 @@ import java.util.Set;
 \r
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Task;\r
+import org.tianocore.build.exception.AutoGenException;\r
+import org.tianocore.build.exception.GenBuildException;\r
+import org.tianocore.build.exception.PcdAutogenException;\r
+import org.tianocore.build.exception.PlatformPcdPreprocessBuildException;\r
 import org.tianocore.build.fpd.FpdParserForThread;\r
 import org.tianocore.build.fpd.FpdParserTask;\r
 import org.tianocore.build.global.GenBuildLogger;\r
@@ -31,6 +36,7 @@ import org.tianocore.build.global.GlobalData;
 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.exception.EdkException;\r
 import org.tianocore.common.logger.EdkLog;\r
 \r
 /**\r
@@ -105,6 +111,37 @@ public class FrameworkBuildTask extends Task{
     private String type = "all";\r
     \r
     public void execute() throws BuildException {\r
+        try {\r
+            processFrameworkBuild();\r
+        } catch (PcdAutogenException e) {\r
+            //\r
+            // Add more logic process here\r
+            //\r
+            throw new BuildException(e.getMessage());\r
+        } catch (AutoGenException e) {\r
+            //\r
+            // Add more logic process here\r
+            //\r
+            throw new BuildException(e.getMessage());\r
+        } catch (PlatformPcdPreprocessBuildException e) {\r
+            //\r
+            // Add more logic process here\r
+            //\r
+            throw new BuildException(e.getMessage());\r
+        } catch (GenBuildException e) {\r
+            //\r
+            // Add more logic process here\r
+            //\r
+            throw new BuildException(e.getMessage());\r
+        } catch (EdkException e) {\r
+            //\r
+            // Add more logic process here\r
+            //\r
+            throw new BuildException(e.getMessage());\r
+        }\r
+    }\r
+    \r
+    private void processFrameworkBuild() throws EdkException, GenBuildException, AutoGenException, PcdAutogenException, PlatformPcdPreprocessBuildException {\r
         //\r
         // set Logger\r
         //\r
@@ -143,7 +180,7 @@ public class FrameworkBuildTask extends Task{
                     }\r
                 }\r
             }\r
-        } catch (Exception e) {\r
+        } catch (IOException e) {\r
             throw new BuildException(e.getMessage());\r
         }\r
         \r
@@ -199,12 +236,12 @@ public class FrameworkBuildTask extends Task{
         // Build every FPD files (PLATFORM build)\r
         //\r
         if (buildFile.getName().endsWith(ToolDefinitions.FPD_EXTENSION)) {\r
-            System.out.println("Processing the FPD file [" + buildFile.getPath() + "] ..>> ");\r
+            EdkLog.log(this, "Processing the FPD file [" + buildFile.getPath() + "] ..>> ");\r
             //\r
             // Iff for platform build will enable the multi-thread if set in target.txt\r
             //\r
             if (multithread && type.equalsIgnoreCase("all")) {\r
-                System.out.println("Multi-thread build is enabled. ");\r
+                EdkLog.log(this, "Multi-thread build is enabled. ");\r
                 FpdParserForThread fpdParserForThread = new FpdParserForThread();\r
                 fpdParserForThread.setType(type);\r
                 fpdParserForThread.setProject(getProject());\r
@@ -237,8 +274,8 @@ public class FrameworkBuildTask extends Task{
         //\r
         else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {\r
             File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
-            System.out.println("Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
-            System.out.println("Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
+            EdkLog.log(this, "Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
+            EdkLog.log(this, "Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
             GenBuildTask genBuildTask = new GenBuildTask();\r
             genBuildTask.setSingleModuleBuild(true);\r
             genBuildTask.setType(type);\r
@@ -290,13 +327,13 @@ public class FrameworkBuildTask extends Task{
                 index++;\r
             }\r
 \r
-            System.out.println("Finding " + allFiles.length + " FPD files: ");\r
+            EdkLog.log(this, "Finding " + allFiles.length + " FPD files: ");\r
             for (int i = 0; i < allFiles.length; i++) {\r
                 System.out.println("[" + (i + 1) + "]: " + allFiles[i].getName());\r
             }\r
             \r
             boolean flag = true;\r
-            System.out.print("Please select one of the following FPD files to build:[1] ");\r
+            EdkLog.log(this, "Please select one of the following FPD files to build:[1] ");\r
             do{\r
                 BufferedReader br = new BufferedReader(new InputStreamReader(System.in));\r
                 try {\r
@@ -308,7 +345,7 @@ public class FrameworkBuildTask extends Task{
                      }\r
                      int indexSelect = Integer.parseInt(str);\r
                      if (indexSelect <=0 || indexSelect > allFiles.length) {\r
-                         System.out.print("Please enter a number between [1.." + allFiles.length + "]:[1] ");\r
+                         EdkLog.log(this, "Please enter a number between [1.." + allFiles.length + "]:[1] ");\r
                          continue ;\r
                      } else {\r
                          file = allFiles[indexSelect - 1];\r
@@ -316,7 +353,7 @@ public class FrameworkBuildTask extends Task{
                          continue ;\r
                      }\r
                 } catch (Exception e) {\r
-                    System.out.print("Please enter a valid number:[1] ");\r
+                    EdkLog.log(this, "Please enter a valid number:[1] ");\r
                     flag = true;\r
                 }\r
             } while (flag);\r
@@ -335,69 +372,63 @@ public class FrameworkBuildTask extends Task{
         }\r
     }\r
     \r
-    private void readTargetFile(){\r
-        try {\r
-            String targetFile = getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + targetFilename;\r
-            \r
-            String[][] targetFileInfo = ConfigReader.parse(targetFile);\r
-            \r
-            //\r
-            // Get ToolChain Info from target.txt\r
-            //\r
-            ToolChainInfo envToolChainInfo = new ToolChainInfo(); \r
-            String str = getValue(ToolDefinitions.TARGET_KEY_TARGET, targetFileInfo);\r
-            if (str == null || str.trim().equals("")) {\r
-                envToolChainInfo.addTargets("*");\r
-            } else {\r
-                envToolChainInfo.addTargets(str);\r
-            }\r
-            str = getValue(ToolDefinitions.TARGET_KEY_TOOLCHAIN, targetFileInfo);\r
-            if (str == null || str.trim().equals("")) {\r
-                envToolChainInfo.addTagnames("*");\r
-            } else {\r
-                envToolChainInfo.addTagnames(str);\r
-            }\r
-            str = getValue(ToolDefinitions.TARGET_KEY_ARCH, targetFileInfo);\r
-            if (str == null || str.trim().equals("")) {\r
-                envToolChainInfo.addArchs("*");\r
-            } else {\r
-                envToolChainInfo.addArchs(str);\r
-            }\r
-            GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
-            \r
-            str = getValue(ToolDefinitions.TARGET_KEY_TOOLS_DEF, targetFileInfo);\r
-            if (str != null && str.trim().length() > 0) {\r
-                toolsDefFilename = str;\r
-            }\r
-            \r
-            str = getValue(ToolDefinitions.TARGET_KEY_ACTIVE_PLATFORM, targetFileInfo);\r
-            if (str != null && ! str.trim().equals("")) {\r
-                if ( ! str.endsWith(".fpd")) {\r
-                    throw new BuildException("FPD file's extension must be \"" + ToolDefinitions.FPD_EXTENSION + "\"!");\r
-                }\r
-                activePlatform = str;\r
-            }\r
-            \r
-            str = getValue(ToolDefinitions.TARGET_KEY_MULTIPLE_THREAD, targetFileInfo);\r
-            if (str != null && str.trim().equalsIgnoreCase("Enable")) {\r
-                multithread = true;\r
+    private void readTargetFile() throws EdkException{\r
+        String targetFile = getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + targetFilename;\r
+        \r
+        String[][] targetFileInfo = ConfigReader.parse(targetFile);\r
+        \r
+        //\r
+        // Get ToolChain Info from target.txt\r
+        //\r
+        ToolChainInfo envToolChainInfo = new ToolChainInfo(); \r
+        String str = getValue(ToolDefinitions.TARGET_KEY_TARGET, targetFileInfo);\r
+        if (str == null || str.trim().equals("")) {\r
+            envToolChainInfo.addTargets("*");\r
+        } else {\r
+            envToolChainInfo.addTargets(str);\r
+        }\r
+        str = getValue(ToolDefinitions.TARGET_KEY_TOOLCHAIN, targetFileInfo);\r
+        if (str == null || str.trim().equals("")) {\r
+            envToolChainInfo.addTagnames("*");\r
+        } else {\r
+            envToolChainInfo.addTagnames(str);\r
+        }\r
+        str = getValue(ToolDefinitions.TARGET_KEY_ARCH, targetFileInfo);\r
+        if (str == null || str.trim().equals("")) {\r
+            envToolChainInfo.addArchs("*");\r
+        } else {\r
+            envToolChainInfo.addArchs(str);\r
+        }\r
+        GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
+        \r
+        str = getValue(ToolDefinitions.TARGET_KEY_TOOLS_DEF, targetFileInfo);\r
+        if (str != null && str.trim().length() > 0) {\r
+            toolsDefFilename = str;\r
+        }\r
+        \r
+        str = getValue(ToolDefinitions.TARGET_KEY_ACTIVE_PLATFORM, targetFileInfo);\r
+        if (str != null && ! str.trim().equals("")) {\r
+            if ( ! str.endsWith(".fpd")) {\r
+                throw new BuildException("FPD file's extension must be \"" + ToolDefinitions.FPD_EXTENSION + "\"!");\r
             }\r
+            activePlatform = str;\r
+        }\r
+        \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(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo);\r
-            if (str != null ) {\r
-                try {\r
-                    int threadNum = Integer.parseInt(str);\r
-                    if (threadNum > 0) {\r
-                        MAX_CONCURRENT_THREAD_NUMBER = threadNum;\r
-                    }\r
-                } catch (Exception enuma) {\r
-                    \r
+        str = getValue(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo);\r
+        if (str != null ) {\r
+            try {\r
+                int threadNum = Integer.parseInt(str);\r
+                if (threadNum > 0) {\r
+                    MAX_CONCURRENT_THREAD_NUMBER = threadNum;\r
                 }\r
+            } catch (Exception enuma) {\r
             }\r
         }\r
-        catch (Exception ex) {\r
-            throw new BuildException(ex.getMessage());\r
-        }\r
     }\r
     \r
     private String getValue(String key, String[][] map) {\r

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/exception/EdkException.java b/Tools/Source/GenBuild/org/tianocore/build/exception/EdkException.java
deleted file mode 100644 (file)
index 086ecd8..0000000
--- a/Tools/Source/GenBuild/org/tianocore/build/exception/EdkException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/** @file\r
-  EntityException class.\r
-\r
-  The class handle the exception throwed by entity class.\r
- \r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
- \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/   \r
-package org.tianocore.build.exception;\r
-\r
-/**\r
-  The class handle the exception throwed by entity class.\r
-**/\r
-public class EdkException extends Exception {\r
-    static final long serialVersionUID = -8034897190740066938L;\r
-    /**\r
-      Constructure function\r
-        \r
-      @param expStr exception message string.\r
-    **/\r
-    public EdkException(String expStr) {\r
-        super("[EdkException]:" + expStr);\r
-    }\r
-    \r
-    public EdkException() {\r
-        super();\r
-    }\r
-}\r
-\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
index 375122483f7e04f4f9f458c0f939c45d1222ba4e..05f6e01ee6046ce2b2d073604957a7ee74a8b762 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
@@ -613,7 +613,7 @@ public class PlatformBuildFileGenerator {
                 root.appendChild(recursiveNode(childItem, document));\r
             }\r
             else if (childItem.getNodeType() == Node.TEXT_NODE){\r
-                if ( ! childItem.getNodeValue().trim().equalsIgnoreCase("")) {\r
+                if (!childItem.getNodeValue().trim().equalsIgnoreCase("")) {\r
                     root.setTextContent(childItem.getNodeValue());\r
                 }\r
             }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java b/Tools/Source/GenBuild/org/tianocore/build/global/GenBuildLogger.java
index 9bc3f2d176a80d91e889a2c9ccf475bfde4327b4..f102b9c2714afa17691de9e444de468e05de600f 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,12 @@ 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 {\r
+            this.project.log(msg, level);\r
+        }\r
+    }\r
 }
\ No newline at end of file

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index 45f36ee1fa308e2e0f0a8ed2705a0c943aacc7f1..facd1771a273a6f0ccfb66cb04a64ea8a4c61acf 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
-        System.out.println("Using tool definiton file [" + toolsDefFile.getPath() + "].");\r
+        EdkLog.log("Using tool definiton file [" + toolsDefFile.getPath() + "].");\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
-            System.out.println("Current build tool chain information summary: ");\r
-            System.out.println(toolChainInfo + "");\r
+            EdkLog.log("Current build tool chain information summary: ");\r
+            EdkLog.log(toolChainInfo + "");\r
         }\r
         return toolChainInfo;\r
     }\r