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

[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 6d6a3e5f89aadf89c6dda1850d011f5debbfe006..1021f1afe68f1c68e7a941d066171fce34bc4b0f 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -16,12 +16,16 @@
  **/\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.logger.EdkLog;\r
+\r
 \r
 /**\r
   FwImageTask class.\r
@@ -37,6 +41,7 @@ public class FwImageTask extends Task implements EfiDefine{
     /// input PE image\r
     /// \r
     private String peImage = "";\r
+    private String peImageName = "";\r
     ///\r
     /// output EFI image\r
     /// \r
@@ -65,12 +70,12 @@ public class FwImageTask extends Task implements EfiDefine{
         //\r
         // absolute path of efi tools\r
         //\r
-        String path = project.getProperty("env.Framework_Tools_Path");\r
+        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
@@ -92,23 +97,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
 \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 succeeded!");\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
@@ -153,6 +153,7 @@ public class FwImageTask extends Task implements EfiDefine{
       @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