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

BaseTools: The token values cannot be numeric same with different PCDs. 

Current check only compared string format of toke value.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yingke Liu <yingke.d.liu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17682 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Yingke Liu 2015-06-23 07:02:03 +00:00 committed by yingke
parent 37fe82ee80
commit f827cd07d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -651,7 +651,7 @@ class WorkspaceAutoGen(AutoGen):
for Pa in self.AutoGenObjectList: for Pa in self.AutoGenObjectList:
for Package in Pa.PackageList: for Package in Pa.PackageList:
PcdList = Package.Pcds.values() PcdList = Package.Pcds.values()
PcdList.sort(lambda x, y: cmp(x.TokenValue, y.TokenValue)) PcdList.sort(lambda x, y: cmp(int(x.TokenValue, 0), int(y.TokenValue, 0)))
Count = 0 Count = 0
while (Count < len(PcdList) - 1) : while (Count < len(PcdList) - 1) :
Item = PcdList[Count] Item = PcdList[Count]
@ -659,13 +659,13 @@ class WorkspaceAutoGen(AutoGen):
# #
# Make sure in the same token space the TokenValue should be unique # Make sure in the same token space the TokenValue should be unique
# #
if (Item.TokenValue == ItemNext.TokenValue): if (int(Item.TokenValue, 0) == int(ItemNext.TokenValue, 0)):
SameTokenValuePcdList = [] SameTokenValuePcdList = []
SameTokenValuePcdList.append(Item) SameTokenValuePcdList.append(Item)
SameTokenValuePcdList.append(ItemNext) SameTokenValuePcdList.append(ItemNext)
RemainPcdListLength = len(PcdList) - Count - 2 RemainPcdListLength = len(PcdList) - Count - 2
for ValueSameCount in range(RemainPcdListLength): for ValueSameCount in range(RemainPcdListLength):
if PcdList[len(PcdList) - RemainPcdListLength + ValueSameCount].TokenValue == Item.TokenValue: if int(PcdList[len(PcdList) - RemainPcdListLength + ValueSameCount].TokenValue, 0) == int(Item.TokenValue, 0):
SameTokenValuePcdList.append(PcdList[len(PcdList) - RemainPcdListLength + ValueSameCount]) SameTokenValuePcdList.append(PcdList[len(PcdList) - RemainPcdListLength + ValueSameCount])
else: else:
break; break;
@ -699,7 +699,7 @@ class WorkspaceAutoGen(AutoGen):
# #
# Check PCDs with same TokenSpaceGuidCName.TokenCName have same token value as well. # Check PCDs with same TokenSpaceGuidCName.TokenCName have same token value as well.
# #
if (Item.TokenSpaceGuidCName == ItemNext.TokenSpaceGuidCName) and (Item.TokenCName == ItemNext.TokenCName) and (Item.TokenValue != ItemNext.TokenValue): if (Item.TokenSpaceGuidCName == ItemNext.TokenSpaceGuidCName) and (Item.TokenCName == ItemNext.TokenCName) and (int(Item.TokenValue, 0) != int(ItemNext.TokenValue, 0)):
EdkLogger.error( EdkLogger.error(
'build', 'build',
FORMAT_INVALID, FORMAT_INVALID,