- Fixed EDKT240. Now the Blank.pad file for alignment purpose will no longer be needed.

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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 26b93909019cd75dce831bb3af1f4970d8a950be..dd86346b7f112d6c62747e2788fdfa998e51ad48 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -186,14 +186,18 @@ public class FfsProcess {
         //\r
         Element outofdateEle = document.createElement("OnDependency");\r
         Element sourceEle = document.createElement("sourcefiles");\r
-        String[] result = new String[sectionList.size()];\r
+        Vector<String> sections = new Vector<String>();\r
         for (int i = 0; i < sectionList.size(); i++) {\r
-            result[i] = (String) sectionList.get(i);\r
+            String section = (String) sectionList.get(i);\r
+            if (isSectionType(section)) {\r
+                sections.addElement(section);\r
+            }\r
             Element pathEle = document.createElement("file");\r
-            pathEle.setAttribute("name", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename\r
-                                         + getSectionExt(result[i]));\r
+            pathEle.setAttribute("name", getSectionFile(basename, section));\r
             sourceEle.appendChild(pathEle);\r
         }\r
+        String[] result = sections.toArray(new String[sections.size()]);\r
+\r
         outofdateEle.appendChild(sourceEle);\r
         Element targetEle = document.createElement("targetfiles");\r
         Element fileEle = document.createElement("file");\r
@@ -343,6 +347,7 @@ public class FfsProcess {
     **/\r
     private void dealSection(int mode, Document doc, Element root, XmlCursor cursor, Vector<String> list) {\r
         String type = cursor.getAttributeText(new QName("SectionType"));\r
+        String alignment = cursor.getAttributeText(new QName("Alignment"));\r
         \r
         //\r
         // Judge if file is specified? Yes, just use the file, else call Build Macro\r
@@ -370,16 +375,19 @@ public class FfsProcess {
         \r
         if (fileName == null) {\r
             list.addElement(type);\r
+        } else {\r
+            list.addElement(fileName);\r
         }\r
+\r
         if (mode == MODE_GUID_DEFINED) {\r
             //\r
             // <input file="${DEST_DIR_OUTPUT}\Bds.pe32"/>\r
             //\r
             Element ele = doc.createElement("input");\r
             if (fileName == null) {\r
-                ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));\r
+                ele.setAttribute("file", getSectionFile(basename, type));\r
             } else {\r
-                ele.setAttribute("file", "${PLATFORM_DIR}" + File.separatorChar + fileName);\r
+                ele.setAttribute("file", fileName);\r
             }\r
             root.appendChild(ele);\r
         } else {\r
@@ -388,9 +396,12 @@ public class FfsProcess {
             //\r
             Element ele = doc.createElement("sectFile");\r
             if (fileName == null) {\r
-                ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));\r
+                ele.setAttribute("fileName", getSectionFile(basename, type));\r
             } else {\r
-                ele.setAttribute("fileName", "${PLATFORM_DIR}" + File.separatorChar + fileName);\r
+                ele.setAttribute("fileName", fileName);\r
+            }\r
+            if (alignment != null) {\r
+                ele.setAttribute("Alignment", alignment);\r
             }\r
             root.appendChild(ele);\r
         }\r
@@ -402,13 +413,22 @@ public class FfsProcess {
       @param type Section type\r
       @return Corresponding section file extension\r
     **/\r
-    private String getSectionExt(String type) {\r
+    private String getSectionFile(String basename, String type) {\r
         for (int i = 0; i < sectionExt.length; i++) {\r
             if (sectionExt[i][0].equalsIgnoreCase(type)) {\r
-                return sectionExt[i][1];\r
+                return "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + sectionExt[i][1];\r
             }\r
         }\r
-        return ".sec";\r
+        return type;\r
+    }\r
+\r
+    private boolean isSectionType(String type) {\r
+        for (int i = 0; i < sectionExt.length; i++) {\r
+            if (sectionExt[i][0].equalsIgnoreCase(type)) {\r
+                return true;\r
+            }\r
+        }\r
+        return false;\r
     }\r
 \r
     /**\r