Support using @ToolChainFamily in <Filename> to do the filter. This is also to fix...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1720 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FileProcess.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FileProcess.java
index 09ccd1f94cd8497fab603cfad122fc332b494cc8..59a2e587bde413b522331038631ac416662f5a2e 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FileProcess.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FileProcess.java
@@ -53,14 +53,14 @@ import org.w3c.dom.Node;
 **/\r
 public class FileProcess {\r
     ///\r
 **/\r
 public class FileProcess {\r
     ///\r

-    ///  The mapping information about source suffix, result suffix, file type.\r
+    ///  The mapping information about source suffix, tool code, file type.\r

     ///\r
     public final String[][] fileTypes = { {".h", "", "CHeader" }, \r
     ///\r
     public final String[][] fileTypes = { {".h", "", "CHeader" }, \r

-                                          {".c", "", "CCode" },\r
+                                          {".c", "CC", "CCode" },\r

                                           {".inc", "", "ASMHeader" },\r
                                           {".inc", "", "ASMHeader" },\r

-                                          {".asm", "", "ASM" }, \r
-                                          {".S", "", "ASM" },\r
-                                          {".s", "", "ASM" },\r
+                                          {".asm", "ASM", "ASM" }, \r
+                                          {".S", "ASM", "ASM" },\r
+                                          {".s", "ASM", "ASM" },\r

                                           {".uni", "", "UNI" },\r
                                           {".vfr", "", "VFR" },\r
                                           {".Vfr", "", "VFR" },\r
                                           {".uni", "", "UNI" },\r
                                           {".vfr", "", "VFR" },\r
                                           {".Vfr", "", "VFR" },\r


@@ -74,7 +74,7 @@ public class FileProcess {
                                           {".FYI", "", "FFS" },\r
                                           {".FFS", "", "FFS" },\r
                                           {".bmp", "", "BMP" },\r
                                           {".FYI", "", "FFS" },\r
                                           {".FFS", "", "FFS" },\r
                                           {".bmp", "", "BMP" },\r

-                                          {".i", "", "PPCode"}};\r
+                                          {".i", "PP", "PPCode"}};\r

     ///\r
     /// Current ANT context. \r
     ///\r
     ///\r
     /// Current ANT context. \r
     ///\r


@@ -121,9 +121,9 @@ public class FileProcess {
       @param root Root node\r
       @param unicodeFirst whether build Unicode file firstly or not\r
     **/\r
       @param root Root node\r
       @param unicodeFirst whether build Unicode file firstly or not\r
     **/\r

-    public synchronized void parseFile(String filename, Node root, boolean unicodeFirst) {\r
+    public synchronized void parseFile(String filename, String family, Node root, boolean unicodeFirst) {\r

         this.unicodeFirst = unicodeFirst;\r
         this.unicodeFirst = unicodeFirst;\r

-        parseFile(filename, root);\r
+        parseFile(filename, family, root);\r

     }\r
     \r
     /**\r
     }\r
     \r
     /**\r


@@ -143,9 +143,9 @@ public class FileProcess {
       @param root Root node\r
       @param unicodeFirst whether build Unicode file firstly or not\r
     **/\r
       @param root Root node\r
       @param unicodeFirst whether build Unicode file firstly or not\r
     **/\r

-    public synchronized void parseFile(String filename, String filetype, Node root, boolean unicodeFirst) {\r
+    public synchronized void parseFile(String filename, String filetype, String family, Node root, boolean unicodeFirst) {\r

         this.unicodeFirst = unicodeFirst;\r
         this.unicodeFirst = unicodeFirst;\r

-        parseFile(filename, filetype, root);\r
+        parseFile(filename, filetype, family, root);\r

     }\r
     \r
     /**\r
     }\r
     \r
     /**\r


@@ -154,10 +154,10 @@ public class FileProcess {
       @param filename Source file name\r
       @param root Root node\r
     **/\r
       @param filename Source file name\r
       @param root Root node\r
     **/\r

-    public synchronized void parseFile(String filename, Node root) throws BuildException {\r
+    public synchronized void parseFile(String filename, String family, Node root) throws BuildException {\r

         for (int i = 0; i < fileTypes.length; i++) {\r
             if (filename.endsWith(fileTypes[i][0])) {\r
         for (int i = 0; i < fileTypes.length; i++) {\r
             if (filename.endsWith(fileTypes[i][0])) {\r

-                parseFile(filename, fileTypes[i][2], root);\r
+                parseFile(filename, fileTypes[i][2], family, root);\r

                 return ;\r
             }\r
         }\r
                 return ;\r
             }\r
         }\r


@@ -175,7 +175,21 @@ public class FileProcess {
       @param filetype Source file type\r
       @param root Root node\r
     **/\r
       @param filetype Source file type\r
       @param root Root node\r
     **/\r

-    public synchronized void parseFile(String filename, String filetype, Node root) {\r
+    public synchronized void parseFile(String filename, String filetype, String family, Node root) {\r
+        //\r
+        // Filter file with family. Only family is specified in source file and\r
+        // not include current family will skip the file. \r
+        //\r
+        String toolCode = getToolCodeByFileType(filetype);\r
+        if (family != null && !family.trim().equalsIgnoreCase("")) {\r
+            String toolChainFamily = project.getProperty(toolCode + "_FAMILY");\r
+            if (toolChainFamily != null) {\r
+                if(!toolChainFamily.equalsIgnoreCase(family)) {\r
+                    return ;\r
+                }\r
+            }\r
+        }\r
+        \r

         if (unicodeFirst) {\r
             if ( ! filetype.equalsIgnoreCase("UNI")){\r
                 return ;\r
         if (unicodeFirst) {\r
             if ( ! filetype.equalsIgnoreCase("UNI")){\r
                 return ;\r


@@ -205,7 +219,7 @@ public class FileProcess {
         // If define CC_EXT in tools_def.txt file, the source file with \r
         // different suffix is skipped\r
         //\r
         // If define CC_EXT in tools_def.txt file, the source file with \r
         // different suffix is skipped\r
         //\r

-        String toolsDefExtName = project.getProperty(filetype + "_EXT");\r
+        String toolsDefExtName = project.getProperty(toolCode + "_EXT");\r

         if (toolsDefExtName != null) {\r
             String[] exts = toolsDefExtName.split(" ");\r
             for (int i = 0; i < exts.length; i++) {\r
         if (toolsDefExtName != null) {\r
             String[] exts = toolsDefExtName.split(" ");\r
             for (int i = 0; i < exts.length; i++) {\r


@@ -260,4 +274,13 @@ public class FileProcess {
         ele.appendChild(includesEle);\r
         root.appendChild(ele);\r
     }\r
         ele.appendChild(includesEle);\r
         root.appendChild(ele);\r
     }\r

+    \r
+    private String getToolCodeByFileType(String fileType) {\r
+        for (int i = 0; i < fileTypes.length; i++) {\r
+            if (fileTypes[i][2].equalsIgnoreCase(fileType)) {\r
+                return fileTypes[i][1];\r
+            }\r
+        }\r
+        return null;\r
+    }\r

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 1165263898d1e44720fcd89d83789ac3f15d8f62..4ba6ec4c6ac8d8aa1330ce2111d7c816bc2c580c 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -110,7 +110,7 @@ public class FrameworkBuildTask extends Task{
         // set Logger\r
         //\r
         GenBuildLogger logger = new GenBuildLogger(getProject());\r
         // set Logger\r
         //\r
         GenBuildLogger logger = new GenBuildLogger(getProject());\r

-               EdkLog.setLogLevel(EdkLog.EDK_DEBUG);\r
+        EdkLog.setLogLevel(EdkLog.EDK_DEBUG);\r

         EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         \r
         EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         \r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index 195ffdef715dabd3e3f75de69447ce9e08ef856b..a38c3c69d19989ab5c87a2e35f365b3d0089bc39 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
@@ -363,7 +363,9 @@ public class ModuleBuildFileGenerator {
     **/\r
     private void applyCompileElement(Document document, Node root) {\r
         //\r
     **/\r
     private void applyCompileElement(Document document, Node root) {\r
         //\r

-        // sourceFiles[][0] is FileType, [][1] is File name relative to Module_Dir\r
+        // sourceFiles[][0] is FileType, \r
+        // [][1] is File name relative to Module_Dir, \r
+        // [][2] is ToolChainFamily\r

         //\r
         String[][] sourceFiles = saq.getSourceFiles(fpdModuleId.getArch());\r
 \r
         //\r
         String[][] sourceFiles = saq.getSourceFiles(fpdModuleId.getArch());\r
 \r


@@ -395,9 +397,9 @@ public class ModuleBuildFileGenerator {
             sourceFiles[i][1] = sourceFile.getPath();\r
             String filetype = sourceFiles[i][0];\r
             if (filetype != null) {\r
             sourceFiles[i][1] = sourceFile.getPath();\r
             String filetype = sourceFiles[i][0];\r
             if (filetype != null) {\r

-                fileProcess.parseFile(sourceFiles[i][1], filetype, root, true);\r
+                fileProcess.parseFile(sourceFiles[i][1], filetype, sourceFiles[i][2], root, true);\r

             } else {\r
             } else {\r

-                fileProcess.parseFile(sourceFiles[i][1], root, true);\r
+                fileProcess.parseFile(sourceFiles[i][1], sourceFiles[i][2], root, true);\r

             }\r
         }\r
         \r
             }\r
         }\r
         \r


@@ -422,7 +424,7 @@ public class ModuleBuildFileGenerator {
         // Parse AutoGen.c & AutoGen.h\r
         //\r
         if ( ! fpdModuleId.getModule().getName().equalsIgnoreCase("Shell")) {\r
         // Parse AutoGen.c & AutoGen.h\r
         //\r
         if ( ! fpdModuleId.getModule().getName().equalsIgnoreCase("Shell")) {\r

-            fileProcess.parseFile(project.getProperty("DEST_DIR_DEBUG") + File.separatorChar + "AutoGen.c", root, false);\r
+            fileProcess.parseFile(project.getProperty("DEST_DIR_DEBUG") + File.separatorChar + "AutoGen.c", null, root, false);\r

         }\r
         \r
         //\r
         }\r
         \r
         //\r


@@ -431,9 +433,9 @@ public class ModuleBuildFileGenerator {
         for (int i = 0; i < sourceFiles.length; i++) {\r
             String filetype = sourceFiles[i][0];\r
             if (filetype != null) {\r
         for (int i = 0; i < sourceFiles.length; i++) {\r
             String filetype = sourceFiles[i][0];\r
             if (filetype != null) {\r

-                fileProcess.parseFile(sourceFiles[i][1], filetype, root, false);\r
+                fileProcess.parseFile(sourceFiles[i][1], filetype, sourceFiles[i][2], root, false);\r

             } else {\r
             } else {\r

-                fileProcess.parseFile(sourceFiles[i][1], root, false);\r
+                fileProcess.parseFile(sourceFiles[i][1], sourceFiles[i][2], root, false);\r

             }\r
         }\r
         \r
             }\r
         }\r
         \r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 1e95eb2b1a82b64dd6009297a665a01ee52255fa..6afeb30f5a5b5b8251e037f6c7cc41eede187556 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -38,7 +38,6 @@ import org.tianocore.build.id.PackageIdentification;
 import org.tianocore.build.id.PlatformIdentification;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
 import org.tianocore.common.exception.EdkException;\r
 import org.tianocore.build.id.PlatformIdentification;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
 import org.tianocore.common.exception.EdkException;\r

-import org.tianocore.common.logger.EdkLog;\r

 import org.w3c.dom.Node;\r
 \r
 /**\r
 import org.w3c.dom.Node;\r
 \r
 /**\r


@@ -249,22 +248,32 @@ public class SurfaceAreaQuery {
         returns = get("SourceFiles", xPath);\r
 \r
         if (returns == null || returns.length == 0) {\r
         returns = get("SourceFiles", xPath);\r
 \r
         if (returns == null || returns.length == 0) {\r

-            return new String[0][0];\r
+            return new String[0][3];\r

         }\r
 \r
         Filename[] sourceFileNames = (Filename[]) returns;\r
         List<String[]> outputList = new ArrayList<String[]>();\r
         for (int i = 0; i < sourceFileNames.length; i++) {\r
             List archList = sourceFileNames[i].getSupArchList();\r
         }\r
 \r
         Filename[] sourceFileNames = (Filename[]) returns;\r
         List<String[]> outputList = new ArrayList<String[]>();\r
         for (int i = 0; i < sourceFileNames.length; i++) {\r
             List archList = sourceFileNames[i].getSupArchList();\r

-            if (arch == null || arch.equalsIgnoreCase("") || archList == null || contains(archList, arch)) {\r
-                outputList.add(new String[] {sourceFileNames[i].getToolCode(),sourceFileNames[i].getStringValue()});\r
+            if (arch == null || arch.trim().equalsIgnoreCase("") || archList == null || contains(archList, arch)) {\r
+                outputList.add(new String[] {sourceFileNames[i].getToolCode(), sourceFileNames[i].getStringValue(), sourceFileNames[i].getToolChainFamily()});\r

             }\r
         }\r
 \r
             }\r
         }\r
 \r

-        String[][] outputString = new String[outputList.size()][2];\r
+        String[][] outputString = new String[outputList.size()][3];\r

         for (int index = 0; index < outputList.size(); index++) {\r
         for (int index = 0; index < outputList.size(); index++) {\r

+            //\r
+            // ToolCode (FileType)\r
+            //\r

             outputString[index][0] = outputList.get(index)[0];\r
             outputString[index][0] = outputList.get(index)[0];\r

+            //\r
+            // File name (relative to MODULE_DIR)\r
+            //\r

             outputString[index][1] = outputList.get(index)[1];\r
             outputString[index][1] = outputList.get(index)[1];\r

+            //\r
+            // Tool chain family\r
+            //\r
+            outputString[index][2] = outputList.get(index)[2];\r

         }\r
         return outputString;\r
     }\r
         }\r
         return outputString;\r
     }\r