///\r
private Map<FpdModuleIdentification, String> outfiles;\r
\r
- ///\r
- /// Mapping from FV name to its modules\r
- ///\r
- private Map<String, Set<FpdModuleIdentification>> fvs;\r
-\r
- ///\r
- /// Mapping from sequence number to FV names\r
- ///\r
- private Map<String, Set<String>> sequences;\r
- \r
private boolean isUnified = true;\r
\r
private Project project;\r
\r
private String info = "DO NOT EDIT \n" \r
- + "File auto-generated by build utility\n" \r
+ + "This file is auto-generated by the build utility\n" \r
+ "\n" \r
+ "Abstract:\n"\r
- + "Auto-generated ANT build file for building of EFI Modules/Platforms\n";\r
+ + "Auto-generated ANT build file for building EFI Modules and Platforms\n";\r
\r
- public PlatformBuildFileGenerator(Project project, Map<FpdModuleIdentification, String> outfiles, Map<String, Set<FpdModuleIdentification>> fvs, Map<String, Set<String>> sequences, boolean isUnified){\r
+ public PlatformBuildFileGenerator(Project project, Map<FpdModuleIdentification, String> outfiles, boolean isUnified){\r
this.project = project;\r
this.outfiles = outfiles;\r
- this.fvs = fvs;\r
- this.sequences = sequences;\r
this.isUnified = isUnified;\r
this.platformName = project.getProperty("PLATFORM");\r
}\r
ele.setAttribute("environment", "env");\r
root.appendChild(ele);\r
\r
- Set<String> sequenceKeys = sequences.keySet();\r
- Iterator sequenceIter = sequenceKeys.iterator();\r
- String dependsStr = "prebuild";\r
- while (sequenceIter.hasNext()) {\r
- String num = (String)sequenceIter.next();\r
- if (dependsStr.length() > 0) {\r
- dependsStr += " , ";\r
- }\r
- dependsStr += "modules" + num + ", fvs" + num;\r
- }\r
- \r
//\r
// Default Target\r
//\r
root.appendChild(document.createComment("Default target"));\r
ele = document.createElement("target");\r
ele.setAttribute("name", "all");\r
- ele.setAttribute("depends", dependsStr + ", postbuild");\r
+ ele.setAttribute("depends", "prebuild, modules, fvs, postbuild");\r
root.appendChild(ele);\r
\r
//\r
// Modules and Fvs Target\r
//\r
- sequenceIter = sequenceKeys.iterator();\r
- while (sequenceIter.hasNext()) {\r
- String num = (String)sequenceIter.next();\r
- applyModules(document, root, num);\r
- applyFvs(document, root, num);\r
- }\r
+ applyModules(document, root);\r
+ \r
+ applyFvs(document, root);\r
\r
//\r
// Clean Target\r
xformer.setOutputProperty(OutputKeys.INDENT, "yes");\r
xformer.transform(source, result);\r
} catch (Exception ex) {\r
- throw new BuildException("Generate " + platformName + "_build.xml failed. \n" + ex.getMessage());\r
+ throw new BuildException("Generation of the " + platformName + "_build.xml failed!\n" + ex.getMessage());\r
}\r
}\r
\r
- private void applyModules(Document document, Node root, String num) {\r
+ private void applyModules(Document document, Node root) {\r
root.appendChild(document.createComment("Modules target"));\r
Element ele = document.createElement("target");\r
- ele.setAttribute("name", "modules" + num);\r
- \r
- Set<String> fvNameSet = sequences.get(num);\r
+ ele.setAttribute("name", "modules");\r
\r
- Iterator fvNameIter = fvNameSet.iterator();\r
- while (fvNameIter.hasNext()) {\r
- String fvName = (String)fvNameIter.next();\r
- Set<FpdModuleIdentification> set = fvs.get(fvName);\r
- Iterator iter = set.iterator();\r
- while (iter.hasNext()) {\r
- FpdModuleIdentification fpdModuleId = (FpdModuleIdentification) iter.next();\r
- ModuleIdentification moduleId = fpdModuleId.getModule();\r
- Element moduleEle = document.createElement("GenBuild");\r
- moduleEle.setAttribute("type", "build");\r
- //\r
- // Inherit Properties.\r
- //{"ARCH", "PACKAGE", "PACKAGE_GUID", "PACKAGE_VERSION", "MODULE_DIR"}\r
- //\r
- \r
- //\r
- // ARCH\r
- //\r
- Element property = document.createElement("property");\r
- property.setAttribute("name", "ARCH");\r
- property.setAttribute("value", fpdModuleId.getArch());\r
- moduleEle.appendChild(property);\r
+ Set<FpdModuleIdentification> set = outfiles.keySet();\r
+ Iterator iter = set.iterator();\r
+ while (iter.hasNext()) {\r
+ FpdModuleIdentification fpdModuleId = (FpdModuleIdentification) iter.next();\r
+ ModuleIdentification moduleId = fpdModuleId.getModule();\r
+ Element moduleEle = document.createElement("GenBuild");\r
+ moduleEle.setAttribute("type", "build");\r
+ //\r
+ // Inherit Properties.\r
+ //{"ARCH", "PACKAGE", "PACKAGE_GUID", "PACKAGE_VERSION", "MODULE_DIR"}\r
+ //\r
+ \r
+ //\r
+ // ARCH\r
+ //\r
+ Element property = document.createElement("property");\r
+ property.setAttribute("name", "ARCH");\r
+ property.setAttribute("value", fpdModuleId.getArch());\r
+ moduleEle.appendChild(property);\r
\r
- //\r
- // MODULE_GUID\r
- //\r
- property = document.createElement("property");\r
- property.setAttribute("name", "MODULE_GUID");\r
- property.setAttribute("value", moduleId.getGuid());\r
- moduleEle.appendChild(property);\r
- \r
- //\r
- // MODULE_VERSION\r
- //\r
- property = document.createElement("property");\r
- property.setAttribute("name", "MODULE_VERSION");\r
- property.setAttribute("value", moduleId.getVersion());\r
- moduleEle.appendChild(property);\r
- \r
- //\r
- // PACKAGE_GUID\r
- //\r
- property = document.createElement("property");\r
- property.setAttribute("name", "PACKAGE_GUID");\r
- property.setAttribute("value", moduleId.getPackage().getGuid());\r
- moduleEle.appendChild(property);\r
- \r
- //\r
- // PACKAGE_VERSION\r
- //\r
- property = document.createElement("property");\r
- property.setAttribute("name", "PACKAGE_VERSION");\r
- property.setAttribute("value", moduleId.getPackage().getVersion());\r
- moduleEle.appendChild(property);\r
- \r
- ele.appendChild(moduleEle);\r
- }\r
+ //\r
+ // MODULE_GUID\r
+ //\r
+ property = document.createElement("property");\r
+ property.setAttribute("name", "MODULE_GUID");\r
+ property.setAttribute("value", moduleId.getGuid());\r
+ moduleEle.appendChild(property);\r
+ \r
+ //\r
+ // MODULE_VERSION\r
+ //\r
+ property = document.createElement("property");\r
+ property.setAttribute("name", "MODULE_VERSION");\r
+ property.setAttribute("value", moduleId.getVersion());\r
+ moduleEle.appendChild(property);\r
+ \r
+ //\r
+ // PACKAGE_GUID\r
+ //\r
+ property = document.createElement("property");\r
+ property.setAttribute("name", "PACKAGE_GUID");\r
+ property.setAttribute("value", moduleId.getPackage().getGuid());\r
+ moduleEle.appendChild(property);\r
+ \r
+ //\r
+ // PACKAGE_VERSION\r
+ //\r
+ property = document.createElement("property");\r
+ property.setAttribute("name", "PACKAGE_VERSION");\r
+ property.setAttribute("value", moduleId.getPackage().getVersion());\r
+ moduleEle.appendChild(property);\r
+ \r
+ ele.appendChild(moduleEle);\r
}\r
root.appendChild(ele);\r
}\r
\r
- private void applyFvs(Document document, Node root, String num) {\r
- Set<String> fvNameSet = sequences.get(num);\r
+ private void applyFvs(Document document, Node root) {\r
//\r
// FVS Target\r
//\r
root.appendChild(document.createComment("FVs target"));\r
Element ele = document.createElement("target");\r
- ele.setAttribute("name", "fvs" + num);\r
+ ele.setAttribute("name", "fvs");\r
\r
//\r
// For every Target and ToolChain\r
+ toolchainList[j] + File.separatorChar + "FV";\r
String[] validFv = SurfaceAreaQuery.getFpdValidImageNames();\r
for (int k = 0; k < validFv.length; k++) {\r
- if (fvNameSet.contains(validFv[k]) || ! isListInSequence(validFv[k])) {\r
- String inputFile = fvOutputDir + "" + File.separatorChar + validFv[k].toUpperCase() + ".inf";\r
- Element fvEle = document.createElement("genfvimage");\r
- fvEle.setAttribute("infFile", inputFile);\r
- fvEle.setAttribute("outputDir", fvOutputDir);\r
- ele.appendChild(fvEle);\r
- }\r
+ String inputFile = fvOutputDir + "" + File.separatorChar + validFv[k].toUpperCase() + ".inf";\r
+ Element fvEle = document.createElement("genfvimage");\r
+ fvEle.setAttribute("infFile", inputFile);\r
+ fvEle.setAttribute("outputDir", fvOutputDir);\r
+ ele.appendChild(fvEle);\r
}\r
}\r
}\r
//\r
// Deep Clean Target\r
//\r
- root.appendChild(document.createComment("Clean All target"));\r
+ root.appendChild(document.createComment("Target: cleanall"));\r
Element ele = document.createElement("target");\r
ele.setAttribute("name", "cleanall");\r
\r
//\r
// User Extensions\r
//\r
- root.appendChild(document.createComment("Pre Build Processing"));\r
+ root.appendChild(document.createComment("Pre-Build Processing"));\r
Element ele = document.createElement("target");\r
ele.setAttribute("name", "prebuild");\r
\r
//\r
// User Extensions\r
//\r
- root.appendChild(document.createComment("Post Build Processing"));\r
+ root.appendChild(document.createComment("Post-Build Processing"));\r
Element ele = document.createElement("target");\r
ele.setAttribute("name", "postbuild");\r
\r
}\r
return root;\r
}\r
- \r
- private boolean isListInSequence(String fvName) {\r
- Set<String> numbers = sequences.keySet();\r
- Iterator<String> iter = numbers.iterator();\r
- while (iter.hasNext()) {\r
- Set<String> fvNameSet = sequences.get(iter.next());\r
- if (fvNameSet.contains(fvName)) {\r
- return true;\r
- }\r
- }\r
- return false;\r
- }\r
}\r
projects / mirror_edk2.git / blobdiff