X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FModuleBuildFileGenerator.java;h=f8c78b848e9be34ac43d1f0c9c3c472eda5960af;hb=4917d9ddc38808bce82bc54ee690edf6bb5804a6;hp=cdd88147c3e9bf83b5a955def6e8f8ceea93845a;hpb=88f858a1355fc338f8cc7e9a9246a8c0a98da10f;p=mirror_edk2.git diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java index cdd88147c3..f8c78b848e 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java +++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java @@ -13,9 +13,7 @@ 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; @@ -32,11 +30,11 @@ 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.id.FpdModuleIdentification; import org.tianocore.build.id.ModuleIdentification; import org.tianocore.build.id.PackageIdentification; +import org.tianocore.common.exception.EdkException; import org.w3c.dom.Comment; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -48,16 +46,16 @@ public class ModuleBuildFileGenerator { /// Pass: TARGET, TOOLCHAIN, ARCH /// PACKAGE, PACKAGE_GUID, PACKAGE_VERSION /// - String[] inheritProperties = {"ARCH", "MODULE_GUID", "MODULE_VERSION", "PLATFORM_FILE", "PACKAGE_GUID", "PACKAGE_VERSION"}; + String[] inheritProperties = {"ARCH", "MODULE_GUID", "MODULE_VERSION", "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; @@ -65,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; } /** @@ -139,7 +143,9 @@ public class ModuleBuildFileGenerator { // // Parse all sourfiles but files specified in sections // - applyLibraryInstance(document, ele); + if (!FrameworkBuildTask.multithread) { + applyLibraryInstance(document, ele); + } root.appendChild(ele); // @@ -224,7 +230,7 @@ public class ModuleBuildFileGenerator { xformer.setOutputProperty(OutputKeys.INDENT, "yes"); xformer.transform(source, result); } catch (Exception ex) { - 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()); } } @@ -291,8 +297,8 @@ public class ModuleBuildFileGenerator { @param document current BaseName_build.xml XML document @param root Root element for current **/ - private void applyLibraryInstance(Document document, Node root) { - ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch()); + private void applyLibraryInstance(Document document, Node root) throws EdkException { + ModuleIdentification[] libinstances = saq.getLibraryInstance(fpdModuleId.getArch()); for (int i = 0; i < libinstances.length; i++) { // // Put package file path to module identification @@ -329,20 +335,6 @@ public class ModuleBuildFileGenerator { root.appendChild(ele); } } - - /** - Return the name of the directory that corresponds to the architecture. - This is a translation from the XML Schema tag to a directory that - corresponds to our directory name coding convention. - - **/ - private String archDir(String arch) { - return arch.replaceFirst("X64", "x64") - .replaceFirst("IPF", "Ipf") - .replaceFirst("IA32", "Ia32") - .replaceFirst("ARM", "Arm") - .replaceFirst("EBC", "Ebc"); - } /** Generate the build source files elements for BaseName_build.xml. @@ -351,66 +343,10 @@ 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(); - String arch = project.getProperty("ARCH"); - - // - // WORKSPACE - // - includes.add("${WORKSPACE_DIR}" + File.separatorChar); - - // - // Module iteself - // - includes.add("${MODULE_DIR}"); - includes.add("${MODULE_DIR}" + File.separatorChar + archDir(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 + archDir(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 + archDir(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 + archDir(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); @@ -446,11 +382,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);