rollback to rev.273, merged new updates as well

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

Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java

@@ -14,7 +14,6 @@
 
  **/
 package org.tianocore.framework.tasks;
-import java.io.File;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -23,6 +22,16 @@ 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
   
@@ -30,10 +39,22 @@ import org.apache.tools.ant.types.Commandline;
   
 **/
 public class GenFvImageTask extends Task implements EfiDefine{
+    ///
+    /// tool name
+    ///
+    static final private String toolName = "GenFvImage";
     ///
     /// The name of input inf file
     ///
     private String infFile="";
+    ///
+    /// Output directory
+    ///
+    private String outputDir = ".";
+    ///
+    /// argument list
+    ///
+    LinkedList<String> argList = new LinkedList<String>();
 
     /**
       execute
@@ -44,57 +65,39 @@ public class GenFvImageTask extends Task implements EfiDefine{
     public void execute() throws BuildException  {
         Project project = this.getOwningTarget().getProject();
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");
-        String command = "";
 
-        if (path == null){
+        if (path == null) {
             path = "";
-        }else {
+        } else {
-            path = path + File.separatorChar;
+            path += File.separatorChar;
         }
+        argList.addFirst(path + toolName);
 
-        command = path + "GenFvImage";
+        /// lauch the program
-
+        ///
-        String argument = infFile;
+        ProcessBuilder pb = new ProcessBuilder(argList);
-        
+        pb.directory(new File(outputDir));
+        int exitCode = 0;
         try {
+            Process cmdProc = pb.start();
+            InputStreamReader cmdOut = new InputStreamReader(cmdProc.getInputStream());
+            char[] buf = new char[1024];
 
-            Commandline commandLine = new Commandline();
+            exitCode = cmdProc.waitFor();
-            commandLine.setExecutable(command);
+            if (exitCode != 0) {
-            commandLine.createArgument().setLine(argument);
+                int len = cmdOut.read(buf, 0, 1024);
-            
+                log(new String(buf, 0, len), Project.MSG_ERR);
-            LogStreamHandler streamHandler = new LogStreamHandler(this,
-                                                   Project.MSG_INFO,
-                                                   Project.MSG_WARN);
-            //
-            // create a execute object and set it's commandline
-            //
-            Execute runner = new Execute(streamHandler,null);
-            runner.setAntRun(project);
-            runner.setCommandline(commandLine.getCommandline());            
-            System.out.println(Commandline.toString(commandLine.getCommandline()));
-            
-            int revl = -1;
-            //
-            //  user execute class call external programs - GenFvImage
-            //
-            revl = runner.execute();
-            // 
-            // execute command line success!
-            //
-            if (EFI_SUCCESS == revl){
-                System.out.println("GenFvImage succeeded!");
             } else {
-                
+                log("GenFvImage - DONE!", Project.MSG_VERBOSE);
-            // 
-            // execute command line failed! 
-            //
-                throw new BuildException("GenFvImage failed !(error =" + 
-                    Integer.toHexString(revl) + ")");
             }
-            
         } catch (Exception e) {
-            System.out.println(e.getMessage());
+            throw new BuildException(e.getMessage());
+        } finally {
+            if (exitCode != 0) {
+                throw new BuildException("GenFvImage: failed to generate FV file!");
+            }
         }
+
     }
     /**
       getInfFile
@@ -114,7 +117,30 @@ public class GenFvImageTask extends Task implements EfiDefine{
       @param infFile  name of infFile
     **/
     public void setInfFile(String infFile) {
-        this.infFile = "-I " + infFile;
+        this.infFile = infFile;
+        argList.add("-I");
+        argList.add(infFile);
     }
     
+    /**
+      getOutputDir
+      
+      This function is to get output directory.
+      
+      @return                Path of output directory.
+    **/
+    public String getOutputDir() {
+        return outputDir;
+    }
+
+    /**
+      setOutputDir
+      
+      This function is to set output directory.
+      
+      @param outputDir        The output direcotry.
+    **/
+    public void setOutputDir(String outputDir) {
+        this.outputDir = outputDir;
+    }
 }