Modify GenFfsTask to make it don't create ORG file.

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
index adfe4c78ce85ccfd9b431f79562a97696e872c14..b84ea4759517faa6c115783bfc20e4736eee119c 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -2,27 +2,31 @@
  FwImageTask class.\r
 \r
  FwImageTask is used to call FwImage.ext to generate the FwImage.\r
-  \r
- \r
+\r
+\r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
  http://opensource.org/licenses/bsd-license.php\r
- \r
+\r
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
  **/\r
 package org.tianocore.framework.tasks;\r
 \r
-import org.apache.tools.ant.Task;\r
-import org.apache.tools.ant.Project;\r
+import java.io.File;\r
+\r
 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
-import org.tianocore.build.*;\r
+\r
+import org.tianocore.common.logger.EdkLog;\r
+\r
 \r
 /**\r
   FwImageTask class.\r
@@ -31,16 +35,17 @@ import org.tianocore.build.*;
 **/\r
 public class FwImageTask extends Task implements EfiDefine{\r
     ///\r
-    /// time&data \r
+    /// time&data\r
     ///\r
     private String time = "";\r
     ///\r
     /// input PE image\r
-    /// \r
+    ///\r
     private String peImage = "";\r
+    private String peImageName = "";\r
     ///\r
     /// output EFI image\r
-    /// \r
+    ///\r
     private String outImage = "";\r
     ///\r
     /// component type\r
@@ -49,15 +54,15 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
      * assemble tool command line & execute tool command line\r
-     * \r
+     *\r
      * @throws BuildException\r
      */\r
     /**\r
-      execute \r
-      \r
+      execute\r
+\r
       FwimageTask execute function is to assemble tool command line & execute\r
       tool command line\r
-      \r
+\r
       @throws BuidException\r
     **/\r
     public void execute() throws BuildException {\r
@@ -69,9 +74,9 @@ public class FwImageTask extends Task implements EfiDefine{
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
         String command;\r
         if (path == null) {\r
-            command = "fwimage";\r
+            command = "FwImage";\r
         } else {\r
-            command = path + "/" + "fwimage";\r
+            command = path + "/" + "FwImage";\r
         }\r
         //\r
         // argument of tools\r
@@ -93,24 +98,18 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
             runner.setAntRun(project);\r
             runner.setCommandline(cmdline.getCommandline());\r
-            //System.out.println(Commandline.toString(cmdline.getCommandline()));\r
-            //GenBuildTask.myLogger.log(Commandline.toString(cmdline.getCommandline()),0);\r
-            //getProject().log(Commandline.toString(cmdline.getCommandline()));\r
+\r
+            log(Commandline.toString(cmdline.getCommandline()), Project.MSG_VERBOSE);\r
+            log(this.peImageName);\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                //\r
-                // command execution success\r
-                //\r
-                System.out.println("fwimage successed!");\r
+                log("FwImage succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                System.out.println("fwimage failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-                throw new BuildException("fwimage failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-\r
+                log("ERROR = " + Integer.toHexString(revl));\r
+                throw new BuildException("FwImage failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
@@ -119,9 +118,9 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       setTime\r
-      \r
+\r
       This function is to set operation of class member "time".\r
-      \r
+\r
       @param time            string of time\r
     **/\r
     public void setTime(String time) {\r
@@ -130,7 +129,7 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       getTime\r
-      \r
+\r
       This function is to get class member "time"\r
       @return time          string of time\r
     **/\r
@@ -140,7 +139,7 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       getPeImage\r
-      \r
+\r
       This function is to get class member "peImage".\r
       @return                name of PE image\r
     **/\r
@@ -150,17 +149,18 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       setPeImage\r
-      \r
+\r
       This function is to set class member "peImage"\r
       @param  peImage        name of PE image\r
     **/\r
     public void setPeImage(String peImage) {\r
+        this.peImageName = (new File(peImage)).getName();\r
         this.peImage = " " + peImage;\r
     }\r
 \r
     /**\r
       getOutImage\r
-      \r
+\r
       This function is to get class member "outImage".\r
       @return                 name of output EFI image\r
     **/\r
@@ -170,7 +170,7 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       setOutImage\r
-      \r
+\r
       This function is to set class member "outImage".\r
       @param outImage         name of output EFI image\r
     **/\r
@@ -180,9 +180,9 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       getComponentType\r
-      \r
+\r
       This function is to get class member "componentType".\r
-      \r
+\r
       @return                 string of componentType\r
     **/\r
     public String getComponentType() {\r
@@ -191,7 +191,7 @@ public class FwImageTask extends Task implements EfiDefine{
 \r
     /**\r
       setComponentType\r
-      \r
+\r
       This function is to set class member "componentType".\r
       @param  componentType   string of component type\r
     **/\r