tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up for debug message of PCD tools. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@704 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2006-07-01 02:19:31 +00:00
parent 91e2ca2406
commit e39bb31c57
3 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
View File

@ -152,10 +152,8 @@ public class FpdParserTask extends Task {
// Pcd Collection. Call CollectPCDAction to collect pcd info. // Pcd Collection. Call CollectPCDAction to collect pcd info.
// //
try { try {
System.out.println("Begin PCD collecttion!");
CollectPCDAction ca = new CollectPCDAction(); CollectPCDAction ca = new CollectPCDAction();
ca.perform(GlobalData.getWorkspacePath(),platformId.getFpdFile().getPath(),ActionMessage.NULL_MESSAGE_LEVEL); ca.perform(GlobalData.getWorkspacePath(),platformId.getFpdFile().getPath(),ActionMessage.NULL_MESSAGE_LEVEL);
System.out.println("End PCD collection!");
} catch (Exception e){ } catch (Exception e){
throw new BuildException(e.getMessage()); throw new BuildException(e.getMessage());
} }

19
Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
View File

@ -2037,28 +2037,13 @@ public class CollectPCDAction {
} }
//map.put("FrameworkPlatformDescription", fpdDocInstance);
//SurfaceAreaQuery.setDoc(map);
Map<FpdModuleIdentification,XmlObject>pcdBuildDef = GlobalData.getFpdModuleSaXmlObject(CollectPCDAction.xmlObjectName); Map<FpdModuleIdentification,XmlObject>pcdBuildDef = GlobalData.getFpdModuleSaXmlObject(CollectPCDAction.xmlObjectName);
Set<FpdModuleIdentification> pcdBuildKeySet = pcdBuildDef.keySet(); Set<FpdModuleIdentification> pcdBuildKeySet = pcdBuildDef.keySet();
Iterator item = pcdBuildKeySet.iterator(); Iterator item = pcdBuildKeySet.iterator();
while (item.hasNext()){ while (item.hasNext()){
FpdModuleIdentification id = (FpdModuleIdentification)item.next(); FpdModuleIdentification id = (FpdModuleIdentification)item.next();
try { allModules.add(new ModuleInfo(id, id.getModule().getModuleType(),pcdBuildDef.get(id)));
allModules.add(new ModuleInfo(id, id.getModule().getModuleType(),pcdBuildDef.get(id)));
} catch (Exception e){
System.out.println(e.getMessage());
//EdkLog.log(EdkLog.EDK_INFO,e.getMessage());
}
} }
// //modules = SurfaceAreaQuery.getFpdModuleSAs();
// for (index = 0; index < modules.length; index ++) {
// //SurfaceAreaQuery.setDoc(GlobalData.getDoc(modules[index].getModuleName()));
// allModules.add(new ModuleInfo(modules[index],
// ModuleTypeDef.Enum.forString(SurfaceAreaQuery.getModuleType())));
// }
return allModules; return allModules;
} }

27
Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
View File

@ -223,21 +223,14 @@ public class PCDAutoGenAction extends BuildAction {
hAutoGenString = ""; hAutoGenString = "";
cAutoGenString = ""; cAutoGenString = "";
try { try {
setModuleName(moduleName); setModuleName(moduleName);
setModuleGuid(translateSchemaStringToUUID(moduleGuidString)); setModuleGuid(translateSchemaStringToUUID(moduleGuidString));
setPackageName(packageName); setPackageName(packageName);
setPackageGuid(translateSchemaStringToUUID(packageGuidString)); setPackageGuid(translateSchemaStringToUUID(packageGuidString));
setPcdNameArray(pcdNameArray); setPcdNameArray(pcdNameArray);
setArch(arch); setArch(arch);
setVersion(version); setVersion(version);
setIsBuildUsedLibrary(isBuildUsedLibrary); setIsBuildUsedLibrary(isBuildUsedLibrary);
if (isBuildUsedLibrary) {
System.out.println("Build for library");
for (int index = 0; index < pcdNameArray.length; index ++) {
System.out.println(pcdNameArray[index]);
}
}
} catch (EntityException e){ } catch (EntityException e){
throw new BuildActionException(e.getMessage()); throw new BuildActionException(e.getMessage());
} }
@ -400,14 +393,12 @@ private UUID translateSchemaStringToUUID(String uuidString)
dbManager.UsageInstanceContext = usageInstanceArray; dbManager.UsageInstanceContext = usageInstanceArray;
dbManager.CurrentModuleName = moduleName; dbManager.CurrentModuleName = moduleName;
} else { } else {
System.out.println(String.format("Generate %s 's library", dbManager.CurrentModuleName));
usageContext = dbManager.UsageInstanceContext; usageContext = dbManager.UsageInstanceContext;
// //
// For building MDE package, although all module are library, but PCD entries of // For building MDE package, although all module are library, but PCD entries of
// these library should be used to autogen. // these library should be used to autogen.
// //
if (usageContext == null) { if (usageContext == null) {
System.out.println("context is null");
usageInstanceArray = dbManager.getUsageInstanceArrayByModuleName(moduleName, usageInstanceArray = dbManager.getUsageInstanceArrayByModuleName(moduleName,
moduleGuid, moduleGuid,
packageName, packageName,
@ -416,7 +407,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
version); version);
} else { } else {
usageInstanceArray = new ArrayList<UsageInstance>(); usageInstanceArray = new ArrayList<UsageInstance>();
System.out.println("context is not null!");
// //
// Remove PCD entries which are not belong to this library. // Remove PCD entries which are not belong to this library.
// //
@ -427,7 +417,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
for (index2 = 0; index2 < pcdNameArray.length; index2 ++) { for (index2 = 0; index2 < pcdNameArray.length; index2 ++) {
if (pcdNameArray[index2].equalsIgnoreCase(usageContext.get(index).parentToken.cName)) { if (pcdNameArray[index2].equalsIgnoreCase(usageContext.get(index).parentToken.cName)) {
System.out.println("Found! for PCD entry " + pcdNameArray[index2]);
usageInstanceArray.add(usageContext.get(index)); usageInstanceArray.add(usageContext.get(index));
break; break;
} }