1.Change environment variable from "Framework_Tools_Path" to "FRAMEWORK_TOOLS_PATH".

[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 19583b5c9030f9f9cbec4af237dc7b774c540621..adfe4c78ce85ccfd9b431f79562a97696e872c14 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -22,6 +22,7 @@ import org.apache.tools.ant.BuildException;
 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
 /**\r
   FwImageTask class.\r
@@ -65,12 +66,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,14 +93,15 @@ 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
+            //System.out.println(Commandline.toString(cmdline.getCommandline()));\r
+            //GenBuildTask.myLogger.log(Commandline.toString(cmdline.getCommandline()),0);\r
+            //getProject().log(Commandline.toString(cmdline.getCommandline()));\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
                 //\r
                 // command execution success\r
                 //\r
-                System.out.println("fwimage succeeded!");\r
+                System.out.println("fwimage successed!");\r
             } else {\r
                 //\r
                 // command execution fail\r