Fix EDKT 188.

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index dbcf346c173291ee4d966c16ceb98db216535b1e..d0c4c5b637f9e881e8a25e0be27bb7e2cb5f57f0 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -18,19 +18,11 @@ package org.tianocore.framework.tasks;
 import org.apache.tools.ant.BuildException;\r
 import org.apache.tools.ant.Project;\r
 import org.apache.tools.ant.Task;\r
-import org.apache.tools.ant.taskdefs.Execute;\r
-import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
-import org.apache.tools.ant.types.Commandline;\r
 \r
 import java.io.File;\r
-import java.io.IOException;\r
-import java.io.InputStream;\r
 import java.io.InputStreamReader;\r
 import java.lang.ProcessBuilder;\r
-import java.util.ArrayList;\r
 import java.util.LinkedList;\r
-import java.util.List;\r
-import java.util.Map;\r
 \r
 /**\r
   GenFvImageTask\r
@@ -78,6 +70,7 @@ public class GenFvImageTask extends Task implements EfiDefine{
         ProcessBuilder pb = new ProcessBuilder(argList);\r
         pb.directory(new File(outputDir));\r
         int exitCode = 0;\r
+        log((new File(this.infFile)).getName());\r
         try {\r
             Process cmdProc = pb.start();\r
             InputStreamReader cmdOut = new InputStreamReader(cmdProc.getInputStream());\r
@@ -86,15 +79,15 @@ public class GenFvImageTask extends Task implements EfiDefine{
             exitCode = cmdProc.waitFor();\r
             if (exitCode != 0) {\r
                 int len = cmdOut.read(buf, 0, 1024);\r
-                log(new String(buf, 0, len), Project.MSG_ERR);\r
+                log(new String(buf, 0, len));\r
             } else {\r
-                log("GenFvImage - DONE!", Project.MSG_VERBOSE);\r
+                log("GenFvImage succeeded!", Project.MSG_VERBOSE);\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 file!");\r
+                throw new BuildException("GenFvImage: failed to generate FV file!");\r
             }\r
         }\r
 \r