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.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
From module build, exception from module surface area invalid.\r
**/\r
public void execute() throws BuildException {\r
- //\r
+ if (!FrameworkBuildTask.multithread) {\r
+ cleanupProperties();\r
+ }\r
+ \r
+ //\r
// set Logger\r
//\r
GenBuildLogger logger = new GenBuildLogger(getProject());\r
EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
EdkLog.setLogger(logger);\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
//\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
\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
// 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
// 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
}\r
}\r
}\r
- \r
- PropertyManager.restore();\r
}\r
\r
/**\r
FpdParserTask fpdParser = new FpdParserTask();\r
fpdParser.setProject(getProject());\r
fpdParser.parseFpdFile(platformId.getFpdFile());\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
+ 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
+ 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
for (int i = 0; i < libinstances.length; i++) {\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
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
projects / mirror_edk2.git / blobdiff