X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkTasks%2Forg%2Ftianocore%2Fframework%2Ftasks%2FGenFvImageTask.java;h=d0c4c5b637f9e881e8a25e0be27bb7e2cb5f57f0;hp=dbcf346c173291ee4d966c16ceb98db216535b1e;hb=c59963f51b2c394c2c5d20f910b697770b506936;hpb=59a372594cd96dea47d811c81e56c02e698a703e

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