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

Fix some bugs and remove unused code. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1201 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2006-08-07 08:21:32 +00:00
parent 74c0c087a2
commit b629771180
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ public class PCDAutoGenAction extends BuildAction {
usageInstanceArray = null; usageInstanceArray = null;
if (!isBuildUsedLibrary) { if (!isBuildUsedLibrary) {
usageInstanceArray = dbManager.getUsageInstanceArrayByModuleName(usageId); usageInstanceArray = dbManager.getUsageInstanceArrayById(usageId);
MemoryDatabaseManager.UsageInstanceContext = usageInstanceArray; MemoryDatabaseManager.UsageInstanceContext = usageInstanceArray;
MemoryDatabaseManager.CurrentModuleName = moduleName; MemoryDatabaseManager.CurrentModuleName = moduleName;
} else if ((pcdNameArrayInMsa != null) && (pcdNameArrayInMsa.length > 0)) { } else if ((pcdNameArrayInMsa != null) && (pcdNameArrayInMsa.length > 0)) {
@ -205,7 +205,7 @@ public class PCDAutoGenAction extends BuildAction {
// these library should be used to autogen. // these library should be used to autogen.
// //
if (usageContext == null) { if (usageContext == null) {
usageInstanceArray = dbManager.getUsageInstanceArrayByModuleName(usageId); usageInstanceArray = dbManager.getUsageInstanceArrayById(usageId);
} else { } else {
usageInstanceArray = new ArrayList<UsageInstance>(); usageInstanceArray = new ArrayList<UsageInstance>();

4
Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
View File

@ -159,9 +159,9 @@ public abstract class PlatformPcdPreprocessAction {
public void putError(String error) { public void putError(String error) {
if (errorString == null) { if (errorString == null) {
errorString = "### ERROR[" + errorCount + "] ###\r\n" + error + "\r\n\r\n"; errorString = "### ERROR[" + errorCount + "] ###\r\n" + error + "\r\n";
} else { } else {
errorString += "### ERROR[" + errorCount + "] ###\r\n" + error + "\r\n\r\n"; errorString += "### ERROR[" + errorCount + "] ###\r\n" + error + "\r\n";
} }
errorCount++; errorCount++;

49
Tools/Source/PcdTools/org/tianocore/pcd/entity/MemoryDatabaseManager.java
View File

@ -220,21 +220,6 @@ public class MemoryDatabaseManager {
} }
} }
/**
Get all PCD record for a module according to module's name, module's GUID,
package name, package GUID, arch, version information.
@param usageId the id of UsageInstance.
@return all usage instance for this module in memory database.
**/
public List<UsageInstance> getUsageInstanceArrayByModuleName(UsageIdentification usageId) {
String primaryKey = UsageInstance.getPrimaryKey(usageId);
return getUsageInstanceArrayByKeyString(primaryKey);
}
public void clearDatabase() { public void clearDatabase() {
memoryDatabase.clear(); memoryDatabase.clear();
} }
@ -246,14 +231,15 @@ public class MemoryDatabaseManager {
@return List<UsageInstance> the list contains all usage instances. @return List<UsageInstance> the list contains all usage instances.
**/ **/
public List<UsageInstance> getUsageInstanceArrayByKeyString(String primaryKey) { public List<UsageInstance> getUsageInstanceArrayById(UsageIdentification usageId) {
Token[] tokenArray = null; Token[] tokenArray = null;
int recordIndex = 0; int recordIndex = 0;
UsageInstance usageInstance = null; UsageInstance usageInstance = null;
List<UsageInstance> returnArray = new ArrayList<UsageInstance>(); List<UsageInstance> returnArray = new ArrayList<UsageInstance>();
String primaryKey = usageId.toString();
tokenArray = getRecordArray(); tokenArray = getRecordArray();
// //
// Loop to find all PCD record related to current module // Loop to find all PCD record related to current module
// //
@ -269,19 +255,34 @@ public class MemoryDatabaseManager {
return returnArray; return returnArray;
} }
public List<Token> getPcdTokenListForModule(UsageIdentification usageId) {
List<UsageInstance> usageList = getUsageInstanceArrayById(usageId);
List<Token> tokenList = new ArrayList<Token>();
if (usageList == null) {
return null;
}
for (int usageIndex = 0; usageIndex < usageList.size(); usageIndex++) {
tokenList.add(usageList.get(usageIndex).parentToken);
}
return tokenList;
}
/** /**
Get all modules name who contains PCD information Get all modules name who contains PCD information
@return Array for module name @return Array for usage's identification
**/ **/
public List<String> getAllModuleArray() public List<UsageIdentification> getAllModuleArray()
{ {
int tokenIndex = 0; int tokenIndex = 0;
int usageIndex = 0; int usageIndex = 0;
int moduleIndex = 0; int moduleIndex = 0;
Token[] tokenArray = null; Token[] tokenArray = null;
Object[] usageInstanceArray = null; Object[] usageInstanceArray = null;
List<String> moduleNames = new ArrayList<String>(); List<UsageIdentification> usageArray = new ArrayList<UsageIdentification>();
UsageInstance usageInstance = null; UsageInstance usageInstance = null;
boolean bFound = false; boolean bFound = false;
String primaryKey = null; String primaryKey = null;
@ -296,17 +297,17 @@ public class MemoryDatabaseManager {
usageInstance = (UsageInstance)((Map.Entry)usageInstanceArray[usageIndex]).getValue(); usageInstance = (UsageInstance)((Map.Entry)usageInstanceArray[usageIndex]).getValue();
primaryKey = usageInstance.getPrimaryKey(); primaryKey = usageInstance.getPrimaryKey();
bFound = false; bFound = false;
for (moduleIndex = 0; moduleIndex < moduleNames.size(); moduleIndex++) { for (moduleIndex = 0; moduleIndex < usageArray.size(); moduleIndex++) {
if (moduleNames.get(moduleIndex).equalsIgnoreCase(primaryKey)) { if (usageArray.get(moduleIndex).toString().equalsIgnoreCase(primaryKey)) {
bFound = true; bFound = true;
break; break;
} }
} }
if (!bFound) { if (!bFound) {
moduleNames.add(primaryKey); usageArray.add(usageInstance.usageId);
} }
} }
} }
return moduleNames; return usageArray;
} }
} }

2
Tools/Source/PcdTools/org/tianocore/pcd/entity/Token.java
View File

@ -193,7 +193,7 @@ public class Token {
if (tokenSpaceName == null) { if (tokenSpaceName == null) {
return cName + "_nullTokenSpaceGuid"; return cName + "_nullTokenSpaceGuid";
} else { } else {
return cName + "_" + tokenSpaceName.toString().replace('-', '_'); return cName + "_" + tokenSpaceName.toString().replace('-', '_').toLowerCase();
} }
} }