X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FModuleBuildFileGenerator.java;h=1bdae21245f594cadb2a82ebd24582d542d86527;hp=4c6843e6b2ce996312a9d16b415bfac9c91f4375;hb=83fba802560b3446de68ac1c280773cf1a4271be;hpb=a29c47e01d9689fad735bbeccfaef67676a425d1
diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index 4c6843e6b2..1bdae21245 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
@@ -13,9 +13,9 @@ package org.tianocore.build;
import java.io.File;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Set;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,8 +30,8 @@ import javax.xml.transform.stream.StreamResult;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.tianocore.build.fpd.FpdParserTask;
-import org.tianocore.build.global.GlobalData;
import org.tianocore.build.global.SurfaceAreaQuery;
+import org.tianocore.build.global.PropertyManager;
import org.tianocore.build.id.FpdModuleIdentification;
import org.tianocore.build.id.ModuleIdentification;
import org.tianocore.build.id.PackageIdentification;
@@ -46,16 +46,16 @@ public class ModuleBuildFileGenerator {
/// Pass: TARGET, TOOLCHAIN, ARCH
/// PACKAGE, PACKAGE_GUID, PACKAGE_VERSION
///
- String[] inheritProperties = {"ARCH", "MODULE_GUID", "MODULE_VERSION", "PLATFORM", "PACKAGE_GUID", "PACKAGE_VERSION"};
+ String[] inheritProperties = {"ARCH", "MODULE_GUID", "MODULE_VERSION", "PLATFORM_FILE", "PACKAGE_GUID", "PACKAGE_VERSION"};
///
/// The information at the header of build.xml.
///
private String info = "DO NOT EDIT \n"
- + "File auto-generated by build utility\n"
+ + "This file is auto-generated by the build utility\n"
+ "\n"
+ "Abstract:\n"
- + "Auto-generated ANT build file for building of EFI Modules/Platforms\n";
+ + "Auto-generated ANT build file for build EFI Modules and Platforms\n";
private FpdModuleIdentification fpdModuleId;
@@ -63,10 +63,16 @@ public class ModuleBuildFileGenerator {
private String ffsKeyword;
- public ModuleBuildFileGenerator(Project project, String ffsKeyword, FpdModuleIdentification fpdModuleId) {
+ private String[] includes;
+
+ private SurfaceAreaQuery saq = null;
+
+ public ModuleBuildFileGenerator(Project project, String ffsKeyword, FpdModuleIdentification fpdModuleId, String[] includes, SurfaceAreaQuery saq) {
this.project = project;
this.fpdModuleId = fpdModuleId;
this.ffsKeyword = ffsKeyword;
+ this.includes = includes;
+ this.saq = saq;
}
/**
@@ -85,7 +91,7 @@ public class ModuleBuildFileGenerator {
Error throws during BaseName_build.xml generating.
**/
public void genBuildFile(String buildFilename) throws BuildException {
- FfsProcess fp = new FfsProcess();
+ FfsProcess fp = new FfsProcess(saq);
DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance();
try {
DocumentBuilder dombuilder = domfac.newDocumentBuilder();
@@ -211,7 +217,8 @@ public class ModuleBuildFileGenerator {
// generate all directory path
//
(new File(file.getParent())).mkdirs();
- Result result = new StreamResult(file);
+ FileOutputStream outputStream = new FileOutputStream(file);
+ Result result = new StreamResult(new OutputStreamWriter(outputStream));
//
// Write the DOM document to the file
@@ -221,8 +228,7 @@ public class ModuleBuildFileGenerator {
xformer.setOutputProperty(OutputKeys.INDENT, "yes");
xformer.transform(source, result);
} catch (Exception ex) {
- ex.printStackTrace();
- throw new BuildException("Module [" + fpdModuleId.getModule().getName() + "] generating build file failed.\n" + ex.getMessage());
+ throw new BuildException("Generating the module [" + fpdModuleId.getModule().getName() + "] build.xml file failed!.\n" + ex.getMessage());
}
}
@@ -233,41 +239,6 @@ public class ModuleBuildFileGenerator {
@param root Root element for current
**/
private void applyCleanElement(Document document, Node root) {
- ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
- for (int i = 0; i < libinstances.length; i++) {
- //
- // Put package file path to module identification
- //
- PackageIdentification packageId = libinstances[i].getPackage();
-
- //
- // Generate ANT script to clean
- //
- Element ele = document.createElement("GenBuild");
- ele.setAttribute("type", "clean");
-
- //
- // Prepare pass down information
- //
- Map passDownMap = new LinkedHashMap();
- for (int j = 0; j < inheritProperties.length; j ++){
- passDownMap.put(inheritProperties[j], "${" + inheritProperties[j] + "}");
- }
- passDownMap.put("MODULE_GUID", libinstances[i].getGuid());
- passDownMap.put("MODULE_VERSION", libinstances[i].getVersion());
-
- passDownMap.put("PACKAGE_GUID", packageId.getGuid());
- passDownMap.put("PACKAGE_VERSION", packageId.getVersion());
-
- for (int j = 0; j < inheritProperties.length; j ++){
- Element property = document.createElement("property");
- property.setAttribute("name", inheritProperties[j]);
- property.setAttribute("value", passDownMap.get(inheritProperties[j]));
- ele.appendChild(property);
- }
-
- root.appendChild(ele);
- }
//
//
//
@@ -290,42 +261,6 @@ public class ModuleBuildFileGenerator {
@param root Root element for current
**/
private void applyDeepcleanElement(Document document, Node root) {
- ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
- for (int i = 0; i < libinstances.length; i++) {
- //
- // Put package file path to module identification
- //
- PackageIdentification packageId = libinstances[i].getPackage();
-
- //
- // Generate ANT script to clean
- //
- Element ele = document.createElement("GenBuild");
- ele.setAttribute("type", "cleanall");
-
- //
- // Prepare pass down information
- //
- Map passDownMap = new LinkedHashMap();
- for (int j = 0; j < inheritProperties.length; j ++){
- passDownMap.put(inheritProperties[j], "${" + inheritProperties[j] + "}");
- }
-
- passDownMap.put("MODULE_GUID", libinstances[i].getGuid());
- passDownMap.put("MODULE_VERSION", libinstances[i].getVersion());
-
- passDownMap.put("PACKAGE_GUID", packageId.getGuid());
- passDownMap.put("PACKAGE_VERSION", packageId.getVersion());
-
- for (int j = 0; j < inheritProperties.length; j ++){
- Element property = document.createElement("property");
- property.setAttribute("name", inheritProperties[j]);
- property.setAttribute("value", passDownMap.get(inheritProperties[j]));
- ele.appendChild(property);
- }
-
- root.appendChild(ele);
- }
//
//
//
@@ -361,8 +296,7 @@ public class ModuleBuildFileGenerator {
@param root Root element for current
**/
private void applyLibraryInstance(Document document, Node root) {
- ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
-// String propertyLibs = "";
+ ModuleIdentification[] libinstances = saq.getLibraryInstance(fpdModuleId.getArch());
for (int i = 0; i < libinstances.length; i++) {
//
// Put package file path to module identification
@@ -374,7 +308,6 @@ public class ModuleBuildFileGenerator {
//
Element ele = document.createElement("GenBuild");
ele.setAttribute("type", "build");
-// ele.setAttribute("inheritAll", "false");
//
// Prepare pass down information
@@ -398,11 +331,9 @@ public class ModuleBuildFileGenerator {
}
root.appendChild(ele);
-// propertyLibs += " " + project.getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib";
}
-// project.setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));
}
-
+
/**
Generate the build source files elements for BaseName_build.xml.
@@ -410,68 +341,19 @@ public class ModuleBuildFileGenerator {
@param root Root element for current
**/
private void applyCompileElement(Document document, Node root) {
- //
- // Prepare the includes: PackageDependencies and Output debug direactory
- //
- Set includes = new LinkedHashSet();
-
- //
- // WORKSPACE
- //
- includes.add("${WORKSPACE_DIR}");
-
- //
- // Module iteself
- //
- includes.add("${MODULE_DIR}");
- includes.add("${MODULE_DIR}" + File.separatorChar + "${ARCH}");
-
- //
- // Packages in PackageDenpendencies
- //
- PackageIdentification[] packageDependencies = SurfaceAreaQuery.getDependencePkg(fpdModuleId.getArch());
- for (int i = 0; i < packageDependencies.length; i++) {
- GlobalData.refreshPackageIdentification(packageDependencies[i]);
- File packageFile = packageDependencies[i].getSpdFile();
- includes.add(packageFile.getParent() + File.separatorChar + "Include");
- includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + "${ARCH}");
- }
-
- //
- // All Dependency Library Instance's PackageDependencies
- //
- ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());
- for (int i = 0; i < libinstances.length; i++) {
- SurfaceAreaQuery.push(GlobalData.getDoc(libinstances[i], fpdModuleId.getArch()));
- PackageIdentification[] libraryPackageDependencies = SurfaceAreaQuery.getDependencePkg(fpdModuleId.getArch());
- for (int j = 0; j < libraryPackageDependencies.length; j++) {
- GlobalData.refreshPackageIdentification(libraryPackageDependencies[j]);
- File packageFile = libraryPackageDependencies[j].getSpdFile();
- includes.add(packageFile.getParent() + File.separatorChar + "Include");
- includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + "${ARCH}");
- }
- SurfaceAreaQuery.pop();
- }
-
-
- //
- // The package which the module belongs to
- // TBD
- includes.add(fpdModuleId.getModule().getPackage().getPackageDir() + File.separatorChar + "Include");
- includes.add(fpdModuleId.getModule().getPackage().getPackageDir() + File.separatorChar + "Include" + File.separatorChar + "${ARCH}");
-
- //
- // Debug files output directory
- //
- includes.add("${DEST_DIR_DEBUG}");
-
//
// sourceFiles[][0] is FileType, [][1] is File name relative to Module_Dir
//
- String[][] sourceFiles = SurfaceAreaQuery.getSourceFiles(fpdModuleId.getArch());
+ String[][] sourceFiles = saq.getSourceFiles(fpdModuleId.getArch());
FileProcess fileProcess = new FileProcess();
fileProcess.init(project, includes, document);
+
+ //
+ // Initialize some properties by user
+ //
+ Element initEle = document.createElement("Build_Init");
+ root.appendChild(initEle);
String moduleDir = project.getProperty("MODULE_DIR");
//
@@ -498,11 +380,10 @@ public class ModuleBuildFileGenerator {
Element ele = document.createElement("Build_Unicode_Database");
ele.setAttribute("FILEPATH", ".");
ele.setAttribute("FILENAME", "${BASE_NAME}");
- String[] includePaths = includes.toArray(new String[includes.size()]);
Element includesEle = document.createElement("EXTRA.INC");
- for (int i = 0; i < includePaths.length; i++) {
+ for (int i = 0; i < includes.length; i++) {
Element includeEle = document.createElement("includepath");
- includeEle.setAttribute("path", includePaths[i]);
+ includeEle.setAttribute("path", includes[i]);
includesEle.appendChild(includeEle);
}
ele.appendChild(includesEle);
@@ -535,7 +416,7 @@ public class ModuleBuildFileGenerator {
for (int i = 0; i < sourceFiles.length; i++) {
str += " " + sourceFiles[i][1];
}
- project.setProperty("SOURCE_FILES", str.replaceAll("(\\\\)", "/"));
+ PropertyManager.setProperty(project, "SOURCE_FILES", str.replaceAll("(\\\\)", "/"));
}
/**
@@ -550,7 +431,7 @@ public class ModuleBuildFileGenerator {
return ;
}
if (fp.initSections(ffsKeyword, project, fpdModuleId)) {
- String targetFilename = fpdModuleId.getModule().getGuid() + "-" + fpdModuleId.getModule().getName() + FpdParserTask.getSuffix(fpdModuleId.getModule().getModuleType());
+ String targetFilename = fpdModuleId.getModule().getGuid() + "-" + "${BASE_NAME}" + FpdParserTask.getSuffix(fpdModuleId.getModule().getModuleType());
String[] list = fp.getGenSectionElements(document, "${BASE_NAME}", fpdModuleId.getModule().getGuid(), targetFilename);
for (int i = 0; i < list.length; i++) {