Fixed the issue caused by introducing INCLUDE_PATH property;

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
index 6754beb6218ccc9d9a840fc3e9e5246475df5d17..d7184cd5d37691a0678dec8d23afe35c6a256c8f 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
@@ -30,7 +30,7 @@ import org.apache.tools.ant.types.Commandline;
   GenCRC32SectionTask is to call GenCRC32Section.exe to generate crc32 section. \r
   \r
 **/\r
-public class GenCRC32SectionTask extends Task implements EfiDefine{\r
+public class GenCRC32SectionTask extends Task implements EfiDefine {\r
     ///\r
     /// output file\r
     ///\r
@@ -38,7 +38,7 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
     ///\r
     /// inputFile list\r
     ///\r
-    private List<Object> inputFileList = new ArrayList<Object>();\r
+    private List<NestElement> inputFileList = new ArrayList<NestElement>();\r
     \r
     ///\r
     /// Project\r
@@ -69,7 +69,11 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
         // \r
         // string line of input files \r
         // \r
-        String inputFiles = list2Str(inputFileList, ""); \r
+        String inputFiles = " -i "; \r
+        for (int i = 0; i < inputFileList.size(); ++i) {\r
+            inputFiles += inputFileList.get(i).toString(" ");\r
+        }\r
+\r
         // \r
         // assemble argument \r
         //\r
@@ -102,7 +106,7 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-// LAH Added This Line\r
+                // LAH Added This Line\r
                 throw new BuildException("GenCRC32Section failed!");\r
             }\r
         } catch (Exception e) {\r
@@ -133,47 +137,5 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
      */\r
     public void setOutputFile(String outputFile) {\r
         this.outputFile = " -o " + outputFile;\r
-    };\r
-    \r
-    /**\r
-     * transfer List to String\r
-     * @param list : nested element list\r
-     * @param tag : interval tag of parameter\r
-     * @return string line of parameters \r
-     */\r
-    private String list2Str(List list, String tag) {\r
-        /*\r
-         * string line for return\r
-         */\r
-        String paraStr = " -i"; \r
-        /*\r
-         * nested element in list\r
-         */\r
-        NestElement element; \r
-        /*\r
-         * iterator of nested element list\r
-         */\r
-        Iterator elementIter = list.iterator(); \r
-        /*\r
-         * string parameter list\r
-         */\r
-        List<Object> strList = new ArrayList<Object>();   \r
-        \r
-        while (elementIter.hasNext()) {\r
-            element = (NestElement) elementIter.next();\r
-            if (null != element.getFile()) {\r
-                FileParser.loadFile(project, strList, element.getFile(), tag);\r
-            } else {\r
-                paraStr = paraStr + element.getName();\r
-            }\r
-        }\r
-        /*\r
-         * iterator of string parameter list\r
-         */\r
-        Iterator strIter = strList.iterator();  \r
-        while (strIter.hasNext()) {\r
-            paraStr = paraStr + " " + strIter.next();\r
-        }\r
-        return paraStr;\r
-    }   \r
+    }\r
 }\r