Polished the build tools' screen output to be in a more coherent form

[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 dc3463890e14bcd9149d1ce3b3431e92ce2bbb24..436fd6482659897d23d28467723e46210c60f76d 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FlashMapTask.java
@@ -29,9 +29,9 @@ import org.apache.tools.ant.BuildException;
 import org.tianocore.logger.EdkLog;\r
 \r
 /**\r
- * SecFixupTask class.\r
+ * FlashMapTask class.\r
  * \r
- * SecFixupTask is used to call SecFixup.exe to fix up sec image.\r
+ * FlashMapTask is used to call FlashMap.exe to generate flash map defition files and fd files.\r
  */\r
 public class FlashMapTask extends Task implements EfiDefine {\r
     // /\r
@@ -40,7 +40,7 @@ public class FlashMapTask extends Task implements EfiDefine {
     private final String toolName = "FlashMap";\r
 \r
     // /\r
-    // / Flash default file\r
+    // / Flash definition file\r
     // /\r
     private String flashDefFile = "";\r
 \r
@@ -181,7 +181,6 @@ public class FlashMapTask extends Task implements EfiDefine {
             }\r
         }\r
 \r
-        EdkLog.log(EdkLog.EDK_INFO, argList.toString().replace(",",""));\r
         //\r
         // lauch the program\r
         //\r
@@ -198,19 +197,19 @@ public class FlashMapTask extends Task implements EfiDefine {
             //\r
             // log command line string.\r
             //\r
-            EdkLog.log(EdkLog.EDK_INFO, cmdProc.getOutputStream().toString());\r
+            EdkLog.log(EdkLog.EDK_VERBOSE, cmdProc.getOutputStream().toString());\r
+            EdkLog.log(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_ERROR, new String(buf, 0, len));\r
+                EdkLog.log(EdkLog.EDK_INFO, new String(buf, 0, len));\r
             } else {\r
-                EdkLog.log(EdkLog.EDK_INFO, "FlashMap succeed!");\r
+                EdkLog.log(EdkLog.EDK_VERBOSE, "FlashMap succeeded!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
         } finally {\r
             if (exitCode != 0) {\r
-                // throw new BuildException("GenFvImage: failed to generate FV\r
-                // file!");\r
+                throw new BuildException("FlashMap failed!");\r
             }\r
         }\r
     }\r