X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFileProcess.java;h=09ccd1f94cd8497fab603cfad122fc332b494cc8;hp=e0a0fff2d528efb5319151d5925047b47f521df9;hb=bf3a7173e34fa0754df81c53f24b72ce40fa5372;hpb=136adffc5cd7efb21a38a980ff361edaa29629b3

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
index e0a0fff2d5..09ccd1f94c 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
@@ -14,7 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 package org.tianocore.build;
 
 import java.io.File;
-import java.util.Set;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -84,7 +83,7 @@ public class FileProcess {
     ///
     /// Current module's include pathes
     ///
-    private Set<String> includes;
+    private String[] includes;
     
     ///
     /// Xml Document.
@@ -109,7 +108,7 @@ public class FileProcess {
       @param sourceFiles Modules source files
       @param document XML document
     **/
-    public void init(Project project, Set<String> includes, Document document) {
+    public void init(Project project, String[] includes, Document document) {
         this.document = document;
         this.includes = includes;
         this.project = project;
@@ -156,16 +155,12 @@ public class FileProcess {
       @param root Root node
     **/
     public synchronized void parseFile(String filename, Node root) throws BuildException {
-        boolean flag = false;
         for (int i = 0; i < fileTypes.length; i++) {
             if (filename.endsWith(fileTypes[i][0])) {
-                flag = true;
                 parseFile(filename, fileTypes[i][2], root);
+                return ;
             }
         }
-        if (!flag) {
-            throw new BuildException("File [" + filename + "] is not known from its suffix.");
-        }
     }
 
     /**
@@ -256,11 +251,10 @@ public class FileProcess {
         ele.setAttribute("FILEPATH", sourceFilepath);
         ele.setAttribute("FILENAME", sourceFilename);
         ele.setAttribute("FILEEXT", sourceFileext.substring(1));
-        String[] includePaths = includes.toArray(new String[includes.size()]);
         Element includesEle = document.createElement("EXTRA.INC");
-        for (int i = 0; i < includePaths.length; i++) {
+        for (int i = 0; i < includes.length; i++) {
             Element includeEle = document.createElement("includepath");
-            includeEle.setAttribute("path", includePaths[i]);
+            includeEle.setAttribute("path", project.replaceProperties(includes[i]));
             includesEle.appendChild(includeEle);
         }
         ele.appendChild(includesEle);