X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=inline;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFfsProcess.java;h=15f975901b73c2c5d9630e8f5582432bef633e57;hb=391dbbb1c00daefe78e7e44499d048943ca866ae;hp=9371c7e6d5de8c9493d8b97aaa3dc270e0df4ba6;hpb=52cbbdbc1680859f5303150d0699a1ebfaa485a4;p=mirror_edk2.git
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
index 9371c7e6d5..15f975901b 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FfsProcess.java
@@ -14,13 +14,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
package org.tianocore.build;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
import java.util.Vector;
import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -32,9 +28,7 @@ import org.tianocore.build.global.SurfaceAreaQuery;
import org.tianocore.build.id.FpdModuleIdentification;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
FfsProcess
is a class to find the corresponding FFS layout.
@@ -170,7 +164,7 @@ public class FfsProcess {
System.out.println("Warning: this module doesn't specify a FfsFormatKey. ");
}
else {
- throw new BuildException("Can't find FfsFormatKey [" + buildType + "] in FPD file. ");
+ throw new BuildException("Can't find the FfsFormatKey [" + buildType + "] attribute in the FPD file!");
}
if (ffs == null) {
@@ -351,20 +345,55 @@ public class FfsProcess {
**/
private void dealSection(int mode, Document doc, Element root, XmlCursor cursor, Vector list) {
String type = cursor.getAttributeText(new QName("SectionType"));
- list.addElement(type);
+
+ //
+ // Judge if file is specified? Yes, just use the file, else call Build Macro
+ // If fileName is null, means without FileNames specify in FPD file
+ //
+ String fileName = null;
+ cursor.push();
+ if (cursor.toFirstChild()) {
+ do {
+ if (cursor.getName().getLocalPart().equalsIgnoreCase("Filenames")) {
+ cursor.push();
+ if (cursor.toFirstChild()) {
+ do {
+ if (cursor.getName().getLocalPart().equalsIgnoreCase("Filename")) {
+ fileName = cursor.getTextValue();
+ }
+ } while (cursor.toNextSibling());
+ }
+ cursor.pop();
+ }
+ } while (cursor.toNextSibling());
+ }
+
+ cursor.pop();
+
+ if (fileName == null) {
+ list.addElement(type);
+ }
if (mode == MODE_GUID_DEFINED) {
//
//
//
Element ele = doc.createElement("input");
- ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
+ if (fileName == null) {
+ ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
+ } else {
+ ele.setAttribute("file", "${PLATFORM_DIR}" + File.separatorChar + fileName);
+ }
root.appendChild(ele);
} else {
//
//
//
Element ele = doc.createElement("sectFile");
- ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
+ if (fileName == null) {
+ ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
+ } else {
+ ele.setAttribute("fileName", "${PLATFORM_DIR}" + File.separatorChar + fileName);
+ }
root.appendChild(ele);
}
}