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

[mirror_edk2.git] / Tools / Source / FrameworkTasks / org / tianocore / framework / tasks / FlashMapTask.java

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
index 9b6268903d59d0d3bc6e585f976f1d9f0b1c7734..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
@@ -178,7 +172,7 @@ public class FlashMapTask extends Task implements EfiDefine {
             argList.add("-mcmerge");\r
             Iterator mciList = mciFileArray.iterator();\r
             while (mciList.hasNext()) {\r
-                argList.add(((Input) mciList.next()).getFile());\r
+                argList.addAll(((Input) mciList.next()).getNameList());\r
             }\r
         }\r
 \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