mirror of https://github.com/acidanthera/audk.git
Remove stand-alone module judge when parse FPD file.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1415 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
fb4645773d
commit
0719317158
|
@ -342,7 +342,7 @@ public class GenBuildTask extends Ant {
|
|||
//
|
||||
FpdParserTask fpdParser = new FpdParserTask();
|
||||
fpdParser.setProject(getProject());
|
||||
fpdParser.parseFpdFile(platformId.getFpdFile(), moduleId);
|
||||
fpdParser.parseFpdFile(platformId.getFpdFile());
|
||||
PropertyManager.setProperty("ARCH", fpdParser.getAllArchForModule(moduleId));
|
||||
|
||||
//
|
||||
|
|
|
@ -305,21 +305,17 @@ public class FpdParserTask extends Task {
|
|||
@throws BuildException
|
||||
FPD file is not valid.
|
||||
**/
|
||||
public void parseFpdFile(File fpdFile, ModuleIdentification singleModuleId) throws BuildException {
|
||||
public void parseFpdFile(File fpdFile) throws BuildException {
|
||||
this.fpdFile = fpdFile;
|
||||
parseFpdFile(singleModuleId);
|
||||
}
|
||||
|
||||
private void parseFpdFile() throws BuildException {
|
||||
parseFpdFile(null);
|
||||
}
|
||||
/**
|
||||
Parse FPD file.
|
||||
|
||||
@throws BuildException
|
||||
FPD file is not valid.
|
||||
**/
|
||||
private void parseFpdFile(ModuleIdentification singleModuleId) throws BuildException {
|
||||
private void parseFpdFile() throws BuildException {
|
||||
try {
|
||||
XmlObject doc = XmlObject.Factory.parse(fpdFile);
|
||||
|
||||
|
@ -359,7 +355,7 @@ public class FpdParserTask extends Task {
|
|||
//
|
||||
// Parse all list modules SA
|
||||
//
|
||||
parseModuleSAFiles(singleModuleId);
|
||||
parseModuleSAFiles();
|
||||
|
||||
//
|
||||
// TBD. Deal PCD and BuildOption related Info
|
||||
|
@ -379,12 +375,10 @@ public class FpdParserTask extends Task {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
Parse all modules listed in FPD file.
|
||||
**/
|
||||
private void parseModuleSAFiles(ModuleIdentification singleModuleId) throws EdkException{
|
||||
private void parseModuleSAFiles() throws EdkException{
|
||||
Map<FpdModuleIdentification, Map<String, XmlObject>> moduleSAs = SurfaceAreaQuery.getFpdModules();
|
||||
|
||||
//
|
||||
|
@ -395,18 +389,6 @@ public class FpdParserTask extends Task {
|
|||
while (iter.hasNext()) {
|
||||
FpdModuleIdentification fpdModuleId = (FpdModuleIdentification) iter.next();
|
||||
|
||||
//
|
||||
// If is stand-alone module build, just parse this module, pass others
|
||||
//
|
||||
if (singleModuleId != null) {
|
||||
//
|
||||
// pass others modules
|
||||
//
|
||||
if ( ! fpdModuleId.getModule().equals(singleModuleId)) {
|
||||
continue ;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Judge if Module is existed?
|
||||
// TBD
|
||||
|
|
Loading…
Reference in New Issue