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

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
index 670f6838f21967a8cc76fe8db64bdc4afbcba64e..ed8ef2dc8c17d80cc566e51b9a2d3b09f6398d20 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
@@ -108,12 +108,12 @@ public class StrGatherTask 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 = "strgather";\r
+            command = "StrGather";\r
         } else {\r
-            command = path + "/" + "strgather";\r
+            command = path + "/" + "StrGather";\r
         }\r
 \r
         ///\r
@@ -148,22 +148,18 @@ public class StrGatherTask 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.commandType.substring(2));\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                ///\r
-                /// command execution success\r
-                ///\r
-                System.out.println("strgather succeeded!");\r
+                log("strgather succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 ///\r
                 /// command execution fail\r
                 ///\r
-                System.out.println("strgather failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
-                throw new BuildException("strgather failed. (error="\r
-                        + Integer.toHexString(revl) + ")");\r
+                log("ERROR = " + Integer.toHexString(revl));\r
+                throw new BuildException("strgather failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r