1) Applied ToolArg and FileArg class to represent tool arguments

[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 2a7b8a7e27cddae7986016d20e31c7006b441450..541e96f54f785b2b0f06d4a14c5e892138a82243 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
@@ -44,16 +44,21 @@ import org.tianocore.common.logger.EdkLog;
       -outputHpk      : create an HII export pack of the strings\r
  **/\r
 public class StrGatherTask extends Task implements EfiDefine {\r
-    ///\r
-    /// common options\r
-    ///\r
+    //\r
+    // Tool name\r
+    // \r
+    private static String toolName = "StrGather";\r
+\r
+    //\r
+    // common options\r
+    //\r
     private ToolArg commandType = new ToolArg();\r
 \r
     private ToolArg baseName = new ToolArg();\r
 \r
-    ///\r
-    /// "all/read/write"\r
-    ///\r
+    //\r
+    // "all/read/write"\r
+    //\r
     private ToolArg verbose = new ToolArg();\r
 \r
     private FileArg outputDatabase = new FileArg();\r
@@ -62,25 +67,25 @@ public class StrGatherTask extends Task implements EfiDefine {
 \r
     private InputFile inputFileList = new InputFile();\r
 \r
-    ///\r
-    /// parse options newDatabase -- "ture/false" unquoteString -- "ture/false"\r
-    ///\r
+    //\r
+    // parse options newDatabase -- "ture/false" unquoteString -- "ture/false"\r
+    //\r
     private ToolArg newDatabase = new ToolArg();\r
 \r
     private ToolArg unquotedString = new ToolArg();\r
 \r
     private IncludePath includePathList = new IncludePath();\r
 \r
-    ///\r
-    /// scan options ignoreNotFound -- "ture/false"\r
-    ///\r
+    //\r
+    // scan options ignoreNotFound -- "ture/false"\r
+    //\r
     private ToolArg ignoreNotFound = new ToolArg();\r
 \r
     private SkipExt skipExtList = new SkipExt();\r
 \r
-    ///\r
-    /// dump options\r
-    ///\r
+    //\r
+    // dump options\r
+    //\r
     private ToolArg outputString = new ToolArg();\r
 \r
     private ToolArg outputDefines = new ToolArg();\r
@@ -93,9 +98,9 @@ public class StrGatherTask extends Task implements EfiDefine {
 \r
     private FileArg outputHpk = new FileArg();\r
 \r
-    ///\r
-    /// global variable\r
-    ///\r
+    //\r
+    // global variable\r
+    //\r
     static private Project project;\r
 \r
     /**\r
@@ -112,9 +117,9 @@ public class StrGatherTask extends Task implements EfiDefine {
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH"); \r
         String command;\r
         if (path == null) {\r
-            command = "StrGather";\r
+            command = toolName;\r
         } else {\r
-            command = path + File.separator + "StrGather";\r
+            command = path + File.separator + toolName;\r
         }\r
 \r
         ///\r
@@ -157,13 +162,13 @@ public class StrGatherTask extends Task implements EfiDefine {
 \r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                EdkLog.log(this, EdkLog.EDK_VERBOSE, "StrGather succeeded!");\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, toolName + " succeeded!");\r
             } else {\r
                 ///\r
                 /// command execution fail\r
                 ///\r
                 EdkLog.log(this, "ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("StrGather failed!");\r
+                throw new BuildException(toolName + " failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r