1) Changed ToolArg class to abstract generic arguments of a tool

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
index 5a5e115a975e51e74666c3ce1d45842011c8ab56..0e0ad9cc2f56effab960c2e8c9a323ed633a6c2e 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenDepexTask.java
@@ -14,6 +14,7 @@
 \r
  **/\r
 package org.tianocore.framework.tasks;\r
+\r
 import java.io.File;\r
 \r
 import org.apache.tools.ant.BuildException;\r
@@ -22,6 +23,9 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Execute;\r
 import org.apache.tools.ant.taskdefs.LogStreamHandler;\r
 import org.apache.tools.ant.types.Commandline;\r
+\r
+import org.tianocore.common.logger.EdkLog;\r
+\r
 /**\r
   GenDepexTask\r
   \r
@@ -29,19 +33,19 @@ import org.apache.tools.ant.types.Commandline;
 \r
 **/\r
 public class GenDepexTask extends Task implements EfiDefine {\r
-    ///\r
-    /// output binary dependency files name\r
-    ///\r
-    private String outputFile = "";\r
-    ///\r
-    /// input pre-processed dependency text files name\r
-    ///\r
-    private String inputFile = "";\r
-    private String inputFileName = "";\r
-    ///\r
-    /// padding integer value\r
-    ///\r
-    private String padding = "";\r
+    private static String toolName = "GenDepex";\r
+    //\r
+    // output binary dependency files name\r
+    //\r
+    private FileArg outputFile = new FileArg();\r
+    //\r
+    // input pre-processed dependency text files name\r
+    //\r
+    private FileArg inputFile = new FileArg();\r
+    //\r
+    // padding integer value\r
+    //\r
+    private ToolArg padding = new FileArg();\r
     /**\r
       execute\r
       \r
@@ -57,14 +61,14 @@ public class GenDepexTask extends Task implements EfiDefine {
         String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
         String command;\r
         if (path == null) {\r
-            command = "GenDepex";\r
+            command = toolName;\r
         } else {\r
-            command = path + "/" + "GenDepex";\r
+            command = path + File.separator + toolName;\r
         }\r
         //\r
         // argument of GenDepex tool\r
         //\r
-        String argument = inputFile + outputFile + padding;\r
+        String argument = "" + inputFile + outputFile + padding;\r
         //\r
         // reture value of GenDepex execution\r
         //\r
@@ -82,16 +86,17 @@ public class GenDepexTask extends Task implements EfiDefine {
             runner.setAntRun(project);\r
             runner.setCommandline(commandLine.getCommandline());\r
 \r
-            log(Commandline.toString(commandLine.getCommandline()), Project.MSG_VERBOSE);\r
-            log(inputFileName);\r
+            EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(commandLine.getCommandline()));\r
+            EdkLog.log(this, inputFile.toFileList() + " => " + outputFile.toFileList());\r
+\r
             returnVal = runner.execute();\r
             if (EFI_SUCCESS == returnVal) {\r
-                log("GenDepex succeeded!", Project.MSG_VERBOSE);\r
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenDepex succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
-                log("ERROR = " + Integer.toHexString(returnVal));\r
+                EdkLog.log(this, "ERROR = " + Integer.toHexString(returnVal));\r
                 throw new BuildException("GenDepex failed!");\r
             }\r
         } catch (Exception e) {\r
@@ -106,7 +111,7 @@ public class GenDepexTask extends Task implements EfiDefine {
       @param outputFileName        name of output file\r
     **/\r
     public void setOutputFile(String outputFileName) {\r
-        this.outputFile = " -O " + outputFileName;\r
+        this.outputFile.setArg(" -O ", outputFileName);\r
     }\r
 \r
     /**\r
@@ -117,7 +122,7 @@ public class GenDepexTask extends Task implements EfiDefine {
       @return name of ouput file\r
     **/\r
     public String getOutputFile() {\r
-        return this.outputFile;\r
+        return this.outputFile.getValue();\r
     }\r
 \r
     /**\r
@@ -127,8 +132,7 @@ public class GenDepexTask extends Task implements EfiDefine {
       @param inputFileName          name of inputFile\r
     **/\r
     public void setInputFile(String inputFileName) {\r
-        this.inputFileName = (new File(inputFileName)).getName();\r
-        this.inputFile = " -I " + inputFileName;\r
+        this.inputFile.setArg(" -I ", inputFileName);\r
     }\r
 \r
     /**\r
@@ -138,7 +142,7 @@ public class GenDepexTask extends Task implements EfiDefine {
       @return                       name of input file\r
     **/\r
     public String getInputFile() {\r
-        return this.inputFile;\r
+        return this.inputFile.getValue();\r
     }\r
 \r
     /**\r
@@ -148,7 +152,7 @@ public class GenDepexTask extends Task implements EfiDefine {
       @param paddingNum             padding value\r
     **/\r
     public void setPadding(String paddingNum) {\r
-        this.padding = " -P " + paddingNum;\r
+        this.padding.setArg(" -P ", paddingNum);\r
     }\r
 \r
     /**\r
@@ -158,6 +162,6 @@ public class GenDepexTask extends Task implements EfiDefine {
       @return                       value of padding\r
     **/\r
     public String getPadding() {\r
-        return this.padding;\r
+        return this.padding.getValue();\r
     }\r
 }\r