package org.tianocore.build;\r
\r
import java.io.File;\r
+import java.util.Hashtable;\r
import java.util.Iterator;\r
import java.util.LinkedHashSet;\r
import java.util.List;\r
import java.util.regex.Pattern;\r
\r
import org.apache.tools.ant.BuildException;\r
+import org.apache.tools.ant.BuildListener;\r
+import org.apache.tools.ant.Project;\r
import org.apache.tools.ant.taskdefs.Ant;\r
import org.apache.tools.ant.taskdefs.Property;\r
import org.apache.xmlbeans.XmlObject;\r
import org.tianocore.common.exception.EdkException;\r
import org.tianocore.common.logger.EdkLog;\r
import org.tianocore.build.autogen.AutoGen;\r
+import org.tianocore.build.exception.AutoGenException;\r
+import org.tianocore.build.exception.GenBuildException;\r
+import org.tianocore.build.exception.PcdAutogenException;\r
+import org.tianocore.build.exception.PlatformPcdPreprocessBuildException;\r
import org.tianocore.build.fpd.FpdParserTask;\r
-import org.tianocore.build.global.GenBuildLogger;\r
import org.tianocore.build.global.GlobalData;\r
import org.tianocore.build.global.OutputManager;\r
-import org.tianocore.build.global.PropertyManager;\r
import org.tianocore.build.global.SurfaceAreaQuery;\r
import org.tianocore.build.id.FpdModuleIdentification;\r
import org.tianocore.build.id.ModuleIdentification;\r
/// Module surface area file.\r
///\r
File msaFile;\r
-\r
+ \r
+ public ModuleIdentification parentId;\r
+ \r
private String type = "all"; \r
\r
///\r
private Vector<Property> properties = new Vector<Property>();\r
\r
private boolean isSingleModuleBuild = false;\r
+ \r
+ private SurfaceAreaQuery saq = null;\r
\r
/**\r
Public construct method. It is necessary for ANT task.\r
From module build, exception from module surface area invalid.\r
**/\r
public void execute() throws BuildException {\r
- //\r
- // set Logger\r
- //\r
- GenBuildLogger logger = new GenBuildLogger(getProject());\r
- EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+ this.setTaskName("GenBuild");\r
+ try {\r
+ processGenBuild();\r
+ } catch (PcdAutogenException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (AutoGenException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (PlatformPcdPreprocessBuildException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (GenBuildException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (EdkException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ }\r
+ }\r
+\r
+ private void processGenBuild() throws EdkException, BuildException, GenBuildException, AutoGenException, PcdAutogenException, PlatformPcdPreprocessBuildException {\r
+ if (!FrameworkBuildTask.multithread) {\r
+ cleanupProperties();\r
+ }\r
\r
- PropertyManager.setProject(getProject());\r
- PropertyManager.save();\r
//\r
// Enable all specified properties\r
//\r
Iterator<Property> iter = properties.iterator();\r
while (iter.hasNext()) {\r
Property item = iter.next();\r
- PropertyManager.setProperty(item.getName(), item.getValue());\r
+ getProject().setProperty(item.getName(), item.getValue());\r
}\r
\r
//\r
String moduleVersion = getProject().getProperty("MODULE_VERSION");\r
String packageGuid = getProject().getProperty("PACKAGE_GUID");\r
String packageVersion = getProject().getProperty("PACKAGE_VERSION");\r
+ //\r
+ // If one of module Guid or package Guid is not specified, report error\r
+ //\r
if (moduleGuid == null || packageGuid == null) {\r
throw new BuildException("GenBuild parameter error.");\r
}\r
+ \r
PackageIdentification packageId = new PackageIdentification(packageGuid, packageVersion);\r
+ GlobalData.refreshPackageIdentification(packageId);\r
moduleId = new ModuleIdentification(moduleGuid, moduleVersion);\r
moduleId.setPackage(packageId);\r
+ GlobalData.refreshModuleIdentification(moduleId);\r
Map<String, XmlObject> doc = GlobalData.getNativeMsa(moduleId);\r
- SurfaceAreaQuery.setDoc(doc);\r
- moduleId = SurfaceAreaQuery.getMsaHeader();\r
+ saq = new SurfaceAreaQuery(doc);\r
} else {\r
Map<String, XmlObject> doc = GlobalData.getNativeMsa(msaFile);\r
- SurfaceAreaQuery.setDoc(doc);\r
- moduleId = SurfaceAreaQuery.getMsaHeader();\r
+ saq = new SurfaceAreaQuery(doc);\r
+ moduleId = saq.getMsaHeader();\r
+ moduleId.setMsaFile(msaFile);\r
}\r
- String[] producedLibraryClasses = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED",null);\r
+ \r
+ String[] producedLibraryClasses = saq.getLibraryClasses("ALWAYS_PRODUCED",null);\r
if (producedLibraryClasses.length == 0) {\r
moduleId.setLibrary(false);\r
} else {\r
// Single Module build\r
//\r
prepareSingleModuleBuild();\r
- } else {\r
- //\r
- // Platform build. Restore the platform related info\r
- //\r
- String filename = getProject().getProperty("PLATFORM_FILE");\r
- PlatformIdentification platformId = GlobalData.getPlatform(filename);\r
- PropertyManager.setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));\r
- PropertyManager.setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));\r
-\r
- String packageGuid = getProject().getProperty("PACKAGE_GUID");\r
- String packageVersion = getProject().getProperty("PACKAGE_VERSION");\r
- PackageIdentification packageId = new PackageIdentification(packageGuid, packageVersion);\r
- moduleId.setPackage(packageId);\r
}\r
\r
//\r
//\r
// Judge if arch is all supported by current module. If not, throw Exception.\r
//\r
- List moduleSupportedArchs = SurfaceAreaQuery.getModuleSupportedArchs();\r
+ List moduleSupportedArchs = saq.getModuleSupportedArchs();\r
if (moduleSupportedArchs != null) {\r
for (int k = 0; k < archList.length; k++) {\r
if ( ! moduleSupportedArchs.contains(archList[k])) {\r
\r
for (int k = 0; k < archList.length; k++) {\r
\r
- PropertyManager.setProperty("ARCH", archList[k]);\r
+ getProject().setProperty("ARCH", archList[k]);\r
\r
FpdModuleIdentification fpdModuleId = new FpdModuleIdentification(moduleId, archList[k]);\r
\r
// Whether the module is built before\r
//\r
if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {\r
- System.out.println("\nWARNING: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
+ EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
continue;\r
} else if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
break;\r
// Prepare for target related common properties\r
// TARGET\r
//\r
- PropertyManager.setProperty("TARGET", targetList[i]);\r
+ getProject().setProperty("TARGET", targetList[i]);\r
String[] toolchainList = GlobalData.getToolChainInfo().getTagnames();\r
for(int j = 0; j < toolchainList.length; j ++){\r
//\r
// don't do anything if no tools found\r
//\r
if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r
- System.out.println("Warning: No build issued. No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
+ EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued. No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
continue;\r
}\r
\r
// Prepare for toolchain related common properties\r
// TOOLCHAIN\r
//\r
- PropertyManager.setProperty("TOOLCHAIN", toolchainList[j]);\r
+ getProject().setProperty("TOOLCHAIN", toolchainList[j]);\r
\r
- System.out.println("Build " + moduleId + " start >>>");\r
- System.out.println("Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
- SurfaceAreaQuery.setDoc(GlobalData.getDoc(fpdModuleId));\r
+ EdkLog.log(this, "Build " + moduleId + " start >>>");\r
+ EdkLog.log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
+ saq.push(GlobalData.getDoc(fpdModuleId));\r
\r
//\r
// Prepare for all other common properties\r
}\r
}\r
}\r
- \r
- PropertyManager.restore();\r
}\r
\r
/**\r
Database must be unique. </p>\r
\r
**/\r
- private void prepareSingleModuleBuild(){\r
+ private void prepareSingleModuleBuild() throws EdkException {\r
//\r
// Find out the package which the module belongs to\r
- // TBD: Enhance it!!!!\r
//\r
PackageIdentification packageId = GlobalData.getPackageForModule(moduleId);\r
-\r
+ GlobalData.refreshPackageIdentification(packageId);\r
moduleId.setPackage(packageId);\r
+ GlobalData.refreshModuleIdentification(moduleId);\r
\r
//\r
// Read ACTIVE_PLATFORM's FPD file \r
//\r
FpdParserTask fpdParser = new FpdParserTask();\r
fpdParser.setProject(getProject());\r
- fpdParser.parseFpdFile(platformId.getFpdFile(), moduleId);\r
- PropertyManager.setProperty("ARCH", fpdParser.getAllArchForModule(moduleId));\r
-\r
- //\r
- // Prepare for Platform related common properties\r
- // PLATFORM, PLATFORM_DIR, PLATFORM_RELATIVE_DIR\r
- //\r
- PropertyManager.setProperty("PLATFORM", platformId.getName());\r
- PropertyManager.setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));\r
- PropertyManager.setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));\r
+ fpdParser.parseFpdFile(platformId.getFpdFile());\r
+ getProject().setProperty("ARCH", fpdParser.getAllArchForModule(moduleId));\r
}\r
\r
+ private void cleanupProperties() {\r
+ Project newProject = new Project();\r
+\r
+ Hashtable<String, String> passdownProperties = FrameworkBuildTask.originalProperties;\r
+ Iterator<String> iter = passdownProperties.keySet().iterator();\r
+ while (iter.hasNext()) {\r
+ String item = iter.next();\r
+ newProject.setProperty(item, passdownProperties.get(item));\r
+ }\r
+\r
+ newProject.setInputHandler(getProject().getInputHandler());\r
+\r
+ Iterator listenerIter = getProject().getBuildListeners().iterator();\r
+ while (listenerIter.hasNext()) {\r
+ newProject.addBuildListener((BuildListener) listenerIter.next());\r
+ }\r
+\r
+ getProject().initSubProject(newProject);\r
+\r
+ setProject(newProject);\r
+ }\r
\r
/**\r
Set Module-Related information to properties.\r
// PACKAGE, PACKAGE_GUID, PACKAGE_VERSION, PACKAGE_DIR, PACKAGE_RELATIVE_DIR\r
//\r
PackageIdentification packageId = moduleId.getPackage();\r
- PropertyManager.setProperty("PACKAGE", packageId.getName());\r
- PropertyManager.setProperty("PACKAGE_GUID", packageId.getGuid());\r
- PropertyManager.setProperty("PACKAGE_VERSION", packageId.getVersion());\r
- PropertyManager.setProperty("PACKAGE_DIR", packageId.getPackageDir().replaceAll("(\\\\)", "/"));\r
- PropertyManager.setProperty("PACKAGE_RELATIVE_DIR", packageId.getPackageRelativeDir().replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("PACKAGE", packageId.getName());\r
+ getProject().setProperty("PACKAGE_GUID", packageId.getGuid());\r
+ getProject().setProperty("PACKAGE_VERSION", packageId.getVersion());\r
+ getProject().setProperty("PACKAGE_DIR", packageId.getPackageDir().replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("PACKAGE_RELATIVE_DIR", packageId.getPackageRelativeDir().replaceAll("(\\\\)", "/"));\r
\r
//\r
// MODULE or BASE_NAME, GUID or FILE_GUID, VERSION, MODULE_TYPE\r
// MODULE_DIR, MODULE_RELATIVE_DIR\r
//\r
- PropertyManager.setProperty("MODULE", moduleId.getName());\r
- String baseName = SurfaceAreaQuery.getModuleOutputFileBasename();\r
+ getProject().setProperty("MODULE", moduleId.getName());\r
+ String baseName = saq.getModuleOutputFileBasename();\r
if (baseName == null) {\r
- PropertyManager.setProperty("BASE_NAME", moduleId.getName());\r
+ getProject().setProperty("BASE_NAME", moduleId.getName());\r
} else {\r
- PropertyManager.setProperty("BASE_NAME", baseName);\r
+ getProject().setProperty("BASE_NAME", baseName);\r
}\r
- PropertyManager.setProperty("GUID", moduleId.getGuid());\r
- PropertyManager.setProperty("FILE_GUID", moduleId.getGuid());\r
- PropertyManager.setProperty("VERSION", moduleId.getVersion());\r
- PropertyManager.setProperty("MODULE_TYPE", moduleId.getModuleType());\r
- PropertyManager.setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/"));\r
- PropertyManager.setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("GUID", moduleId.getGuid());\r
+ getProject().setProperty("FILE_GUID", moduleId.getGuid());\r
+ getProject().setProperty("VERSION", moduleId.getVersion());\r
+ getProject().setProperty("MODULE_TYPE", moduleId.getModuleType());\r
+ getProject().setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/"));\r
\r
//\r
// SUBSYSTEM\r
break ;\r
}\r
}\r
- PropertyManager.setProperty("SUBSYSTEM", subsystem);\r
+ getProject().setProperty("SUBSYSTEM", subsystem);\r
\r
//\r
// ENTRYPOINT\r
//\r
if (arch.equalsIgnoreCase("EBC")) {\r
- PropertyManager.setProperty("ENTRYPOINT", "EfiStart");\r
+ getProject().setProperty("ENTRYPOINT", "EfiStart");\r
} else {\r
- PropertyManager.setProperty("ENTRYPOINT", "_ModuleEntryPoint");\r
+ getProject().setProperty("ENTRYPOINT", "_ModuleEntryPoint");\r
}\r
\r
- PropertyManager.setProperty("OBJECTS", "");\r
+ getProject().setProperty("OBJECTS", "");\r
}\r
\r
private void getCompilerFlags(String target, String toolchain, FpdModuleIdentification fpdModuleId) throws EdkException {\r
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME;\r
String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);\r
File cmdFile = new File(cmdPath + File.separatorChar + cmdName);\r
- PropertyManager.setProperty(cmd[m], cmdFile.getPath().replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty(cmd[m], cmdFile.getPath().replaceAll("(\\\\)", "/"));\r
\r
//\r
// set CC_FLAGS\r
Set<String> addset = new LinkedHashSet<String>();\r
Set<String> subset = new LinkedHashSet<String>();\r
putFlagsToSet(addset, cmdFlags);\r
- PropertyManager.setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
+ getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
\r
//\r
// Set CC_EXT\r
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_EXT;\r
String extName = GlobalData.getCommandSetting(key, fpdModuleId);\r
if ( extName != null && ! extName.equalsIgnoreCase("")) {\r
- PropertyManager.setProperty(cmd[m] + "_EXT", extName);\r
+ getProject().setProperty(cmd[m] + "_EXT", extName);\r
} else {\r
- PropertyManager.setProperty(cmd[m] + "_EXT", "");\r
+ getProject().setProperty(cmd[m] + "_EXT", "");\r
}\r
\r
//\r
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FAMILY;\r
String toolChainFamily = GlobalData.getCommandSetting(key, fpdModuleId);\r
if (toolChainFamily != null) {\r
- PropertyManager.setProperty(cmd[m] + "_FAMILY", toolChainFamily);\r
+ getProject().setProperty(cmd[m] + "_FAMILY", toolChainFamily);\r
}\r
\r
//\r
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_SPATH;\r
String spath = GlobalData.getCommandSetting(key, fpdModuleId);\r
if (spath != null) {\r
- PropertyManager.setProperty(cmd[m] + "_SPATH", spath.replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty(cmd[m] + "_SPATH", spath.replaceAll("(\\\\)", "/"));\r
} else {\r
- PropertyManager.setProperty(cmd[m] + "_SPATH", "");\r
+ getProject().setProperty(cmd[m] + "_SPATH", "");\r
}\r
\r
//\r
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_DPATH;\r
String dpath = GlobalData.getCommandSetting(key, fpdModuleId);\r
if (dpath != null) {\r
- PropertyManager.setProperty(cmd[m] + "_DPATH", dpath.replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty(cmd[m] + "_DPATH", dpath.replaceAll("(\\\\)", "/"));\r
} else {\r
- PropertyManager.setProperty(cmd[m] + "_DPATH", "");\r
+ getProject().setProperty(cmd[m] + "_DPATH", "");\r
}\r
}\r
}\r
this.type = type;\r
}\r
\r
- private void applyBuild(String buildTarget, String buildTagname, FpdModuleIdentification fpdModuleId) throws BuildException{\r
+ private void applyBuild(String buildTarget, String buildTagname, FpdModuleIdentification fpdModuleId) throws EdkException {\r
//\r
- // AutoGen\r
+ // Call AutoGen to generate AutoGen.c and AutoGen.h\r
//\r
-\r
- AutoGen autogen = new AutoGen(getProject().getProperty("FV_DIR"), getProject().getProperty("DEST_DIR_DEBUG"), fpdModuleId.getModule(),fpdModuleId.getArch());\r
+ AutoGen autogen = new AutoGen(getProject().getProperty("FV_DIR"), getProject().getProperty("DEST_DIR_DEBUG"), fpdModuleId.getModule(),fpdModuleId.getArch(), saq, parentId);\r
autogen.genAutogen();\r
\r
-\r
//\r
// Get compiler flags\r
//\r
//\r
// Prepare LIBS\r
//\r
- ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());\r
+ ModuleIdentification[] libinstances = saq.getLibraryInstance(fpdModuleId.getArch());\r
String propertyLibs = "";\r
for (int i = 0; i < libinstances.length; i++) {\r
- propertyLibs += " " + getProject().getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib";\r
+ propertyLibs += getProject().getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib" + " ";\r
}\r
- PropertyManager.setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));\r
\r
//\r
// Get all includepath and set to INCLUDE_PATHS\r
// then call the exist BaseName_build.xml directly.\r
//\r
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
- System.out.println("Call user-defined " + moduleId.getName() + "_build.xml");\r
+ EdkLog.log(this, "Call user-defined " + moduleId.getName() + "_build.xml");\r
\r
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
antCall(antFilename, null);\r
// Generate ${BASE_NAME}_build.xml\r
// TBD\r
//\r
- String ffsKeyword = SurfaceAreaQuery.getModuleFfsKeyword();\r
- ModuleBuildFileGenerator fileGenerator = new ModuleBuildFileGenerator(getProject(), ffsKeyword, fpdModuleId, includes);\r
+ String ffsKeyword = saq.getModuleFfsKeyword();\r
+ ModuleBuildFileGenerator fileGenerator = new ModuleBuildFileGenerator(getProject(), ffsKeyword, fpdModuleId, includes, saq);\r
String buildFilename = getProject().getProperty("DEST_DIR_OUTPUT") + File.separatorChar + moduleId.getName() + "_build.xml";\r
fileGenerator.genBuildFile(buildFilename);\r
\r
// then call the exist BaseName_build.xml directly.\r
//\r
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
- System.out.println("Calling user-defined " + moduleId.getName() + "_build.xml");\r
+ EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
\r
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
antCall(antFilename, "clean");\r
// then call the exist BaseName_build.xml directly.\r
//\r
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
- System.out.println("Calling user-defined " + moduleId.getName() + "_build.xml");\r
+ EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
\r
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
antCall(antFilename, "cleanall");\r
this.isSingleModuleBuild = isSingleModuleBuild;\r
}\r
\r
- private String[] prepareIncludePaths(FpdModuleIdentification fpdModuleId) {\r
+ private String[] prepareIncludePaths(FpdModuleIdentification fpdModuleId) throws EdkException{\r
//\r
// Prepare the includes: PackageDependencies and Output debug direactory\r
//\r
//\r
// Packages in PackageDenpendencies\r
//\r
- PackageIdentification[] packageDependencies = SurfaceAreaQuery.getDependencePkg(fpdModuleId.getArch());\r
+ PackageIdentification[] packageDependencies = saq.getDependencePkg(fpdModuleId.getArch());\r
for (int i = 0; i < packageDependencies.length; i++) {\r
GlobalData.refreshPackageIdentification(packageDependencies[i]);\r
File packageFile = packageDependencies[i].getSpdFile();\r
//\r
// All Dependency Library Instance's PackageDependencies\r
//\r
- ModuleIdentification[] libinstances = SurfaceAreaQuery.getLibraryInstance(fpdModuleId.getArch());\r
+ ModuleIdentification[] libinstances = saq.getLibraryInstance(fpdModuleId.getArch());\r
for (int i = 0; i < libinstances.length; i++) {\r
- SurfaceAreaQuery.push(GlobalData.getDoc(libinstances[i], fpdModuleId.getArch()));\r
- PackageIdentification[] libraryPackageDependencies = SurfaceAreaQuery.getDependencePkg(fpdModuleId.getArch());\r
+ saq.push(GlobalData.getDoc(libinstances[i], fpdModuleId.getArch()));\r
+ PackageIdentification[] libraryPackageDependencies = saq.getDependencePkg(fpdModuleId.getArch());\r
for (int j = 0; j < libraryPackageDependencies.length; j++) {\r
GlobalData.refreshPackageIdentification(libraryPackageDependencies[j]);\r
File packageFile = libraryPackageDependencies[j].getSpdFile();\r
includes.add(packageFile.getParent() + File.separatorChar + "Include");\r
includes.add(packageFile.getParent() + File.separatorChar + "Include" + File.separatorChar + archDir(arch));\r
}\r
- SurfaceAreaQuery.pop();\r
+ saq.pop();\r
}\r
\r
\r
includePaths.append(iter.next());\r
includePaths.append("; ");\r
}\r
- PropertyManager.setProperty("INCLUDE_PATHS", getProject().replaceProperties(includePaths.toString()).replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("INCLUDE_PATHS", getProject().replaceProperties(includePaths.toString()).replaceAll("(\\\\)", "/"));\r
\r
return includes.toArray(new String[includes.size()]);\r
}\r
.replaceFirst("IA32", "Ia32")\r
.replaceFirst("ARM", "Arm")\r
.replaceFirst("EBC", "Ebc");\r
- } \r
+ }\r
+ \r
+ \r
+ public void setExternalProperties(Vector<Property> v) {\r
+ this.properties = v;\r
+ }\r
}\r
projects / mirror_edk2.git / blobdiff