sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- Fixed EDKT366. For NT32, using "build run" to launch the NT32 emulator. The run.cmd is still be generated in the ${TARGET_DIR}

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2305 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36
2007-01-25 01:25:02 +00:00
parent 822d4f3a53
commit e3cc406130
15 changed files with 263 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java
View File

@ -347,6 +347,7 @@ public class FfsProcess {
**/
private void dealSection(int mode, Document doc, Element root, XmlCursor cursor, Vector<String> list) {
String type = cursor.getAttributeText(new QName("SectionType"));
String alignment = cursor.getAttributeText(new QName("Alignment"));
//
// Judge if file is specified? Yes, just use the file, else call Build Macro
@ -399,6 +400,9 @@ public class FfsProcess {
} else {
ele.setAttribute("fileName", fileName);
}
if (alignment != null) {
ele.setAttribute("Alignment", alignment);
}
root.appendChild(ele);
}
}

6
Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
View File

@ -323,11 +323,7 @@ public class FrameworkBuildTask extends Task{
}
public void setType(String type) {
if (type.equalsIgnoreCase("clean") || type.equalsIgnoreCase("cleanall")) {
this.type = type.toLowerCase();
} else {
this.type = "all";
}
this.type = type.toLowerCase();
}
private void readTargetFile() throws EdkException{

24
Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
View File

@ -327,10 +327,8 @@ public class GenBuildTask extends Ant {
if (type.equalsIgnoreCase("all") || type.equalsIgnoreCase("build")) {
applyBuild(targetList[i], toolchainList[j], fpdModuleId);
} else if (type.equalsIgnoreCase("clean")) {
applyClean(fpdModuleId);
} else if (type.equalsIgnoreCase("cleanall")) {
applyCleanall(fpdModuleId);
} else {
applyNonBuildTarget(fpdModuleId);
}
}
}
@ -675,6 +673,24 @@ public class GenBuildTask extends Ant {
antCall(antFilename, null);
}
private void applyNonBuildTarget(FpdModuleIdentification fpdModuleId){
//
// if it is CUSTOM_BUILD
// then call the exist BaseName_build.xml directly.
//
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {
EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";
antCall(antFilename, this.type);
return ;
}
String antFilename = getProject().getProperty("DEST_DIR_OUTPUT") + File.separatorChar + moduleId.getName() + "_build.xml";
antCall(antFilename, this.type);
}
private void applyClean(FpdModuleIdentification fpdModuleId){
//
// if it is CUSTOM_BUILD

57
Tools/Java/Source/GenBuild/org/tianocore/build/fpd/PlatformBuildFileGenerator.java
View File

@ -159,7 +159,8 @@ public class PlatformBuildFileGenerator {
// User Extension Post build
//
applyUserExtensionsPostBuild(document, root);
applyUserExtensions(document, root);
document.appendChild(rootComment);
document.appendChild(root);
//
@ -630,7 +631,59 @@ public class PlatformBuildFileGenerator {
root.appendChild(ele);
}
private void applyUserExtensions(Document document, Node root) {
Node[] nodeList = saq.getFpdUserExtensions();
for (int nodeIndex = 0; nodeIndex < nodeList.length; ++nodeIndex) {
Node node = nodeList[nodeIndex];
//
// User Extensions
//
root.appendChild(document.createComment("User Defined Target"));
Element ele = document.createElement("target");
ele.setAttribute("name", node.getAttributes().getNamedItem("Identifier").getNodeValue());
if (node != null) {
//
// For every Target and ToolChain
//
String[] targetList = GlobalData.getToolChainInfo().getTargets();
for (int i = 0; i < targetList.length; i++){
String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();
for(int j = 0; j < toolchainList.length; j++){
//
// Prepare FV_DIR
//
String ffsCommonDir = project.getProperty("BUILD_DIR") + File.separatorChar
+ targetList[i] + "_"
+ toolchainList[j];
File fvDir = new File(ffsCommonDir + File.separatorChar + "FV");
Element fvEle = document.createElement("var");
fvEle.setAttribute("name", "FV_DIR");
fvEle.setAttribute("value", fvDir.getPath().replaceAll("(\\\\)", "/"));
ele.appendChild(fvEle);
Element targetDirEle = document.createElement("var");
targetDirEle.setAttribute("name", "TARGET_DIR");
targetDirEle.setAttribute("value", ffsCommonDir.replaceAll("(\\\\)", "/"));
ele.appendChild(targetDirEle);
NodeList childNodes = node.getChildNodes();
for (int k = 0; k < childNodes.getLength(); k++) {
Node childItem = childNodes.item(k);
if (childItem.getNodeType() == Node.ELEMENT_NODE) {
ele.appendChild(recursiveNode(childItem, document));
}
}
}
}
}
root.appendChild(ele);
}
}
private Element recursiveNode(Node node, Document document) {
Element root = document.createElement(node.getNodeName());
NamedNodeMap attr = node.getAttributes();

16
Tools/Java/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
View File

@ -1492,6 +1492,22 @@ public class SurfaceAreaQuery {
return a.getDomNode();
}
public Node[] getFpdUserExtensions() {
String[] xPath = new String[] { "/UserExtensions[@UserID='TianoCore' and not(@Identifier='1') and not(@Identifier='0')]" };
Object[] queryResult = get("PlatformSurfaceArea", xPath);
if (queryResult == null || queryResult.length == 0) {
return new Node[0];
}
Node[] nodeList = new Node[queryResult.length];
for (int i = 0; i < queryResult.length; ++i) {
UserExtensionsDocument.UserExtensions a = (UserExtensionsDocument.UserExtensions)queryResult[i];
nodeList[i] = a.getDomNode();
}
return nodeList;
}
/**
* Retrieve FV image option information
*