1. Finish Enhancement EDKT345: Support deleting multiple rows together when remove...

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / ModuleBuildFileGenerator.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index 195ffdef715dabd3e3f75de69447ce9e08ef856b..da6847d9da9686755d3bdc6597c3a4089401d1b5 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
-        // 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
@@ -395,9 +397,9 @@ public class ModuleBuildFileGenerator {
             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
-                fileProcess.parseFile(sourceFiles[i][1], root, true);\r
+                fileProcess.parseFile(sourceFiles[i][1], sourceFiles[i][2], root, true);\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
-            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
@@ -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
-                fileProcess.parseFile(sourceFiles[i][1], filetype, root, false);\r
+                fileProcess.parseFile(sourceFiles[i][1], filetype, sourceFiles[i][2], root, false);\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
@@ -463,7 +465,11 @@ public class ModuleBuildFileGenerator {
             String[] list = fp.getGenSectionElements(document, "${BASE_NAME}", fpdModuleId.getModule().getGuid(), targetFilename);\r
 \r
             for (int i = 0; i < list.length; i++) {\r
-                Element ele = document.createElement(list[i]);\r
+                String sectiontype = list[i];\r
+                if (sectiontype.equalsIgnoreCase("EFI_SECTION_RAW") && project.getProperty("MODULE_TYPE").equalsIgnoreCase("SEC")) {\r
+                    sectiontype += "_SEC";\r
+                }\r
+                Element ele = document.createElement(sectiontype);\r
                 ele.setAttribute("FILEPATH", ".");\r
                 ele.setAttribute("FILENAME", "${BASE_NAME}");\r
                 root.appendChild(ele);\r