sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTool: Fixed the StructurePcd incorrect value.

Browse Source 
If user not set Structure overall value in Dsc,
Structure Pcd value would be incorrect.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit 9904222db0)
This commit is contained in:
Feng, Bob C
2018-01-25 15:42:25 +08:00
committed by Yonghong Zhu
parent b90f32046f
commit ef4864d8d9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BaseTools/Source/Python/Workspace/BuildClassObject.py
View File

@ -67,7 +67,7 @@ class PcdClassObject(object):
self.DscDefaultValue = None self.DscDefaultValue = None
if IsDsc: if IsDsc:
self.DscDefaultValue = Value self.DscDefaultValue = Value
## Convert the class to a string ## Convert the class to a string
# #
# Convert each member of the class to string # Convert each member of the class to string
@ -109,7 +109,11 @@ class PcdClassObject(object):
return hash((self.TokenCName, self.TokenSpaceGuidCName)) return hash((self.TokenCName, self.TokenSpaceGuidCName))
class StructurePcd(PcdClassObject): class StructurePcd(PcdClassObject):
def __init__(self, StructuredPcdIncludeFile="", Packages=None, Name=None, Guid=None, Type=None, DatumType=None, Value=None, Token=None, MaxDatumSize=None, SkuInfoList={}, IsOverrided=False, GuidValue=None, validateranges=[], validlists=[], expressions=[],default_store = TAB_DEFAULT_STORES_DEFAULT): def __init__(self, StructuredPcdIncludeFile=None, Packages=None, Name=None, Guid=None, Type=None, DatumType=None, Value=None, Token=None, MaxDatumSize=None, SkuInfoList=None, IsOverrided=False, GuidValue=None, validateranges=None, validlists=None, expressions=None,default_store = TAB_DEFAULT_STORES_DEFAULT):
if SkuInfoList is None: SkuInfoList={}
if validateranges is None: validateranges=[]
if validlists is None: validlists=[]
if expressions is None : expressions=[]
super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions) super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)
self.StructuredPcdIncludeFile = StructuredPcdIncludeFile self.StructuredPcdIncludeFile = StructuredPcdIncludeFile
self.PackageDecs = Packages self.PackageDecs = Packages
@ -441,4 +445,3 @@ class PlatformBuildClassObject(object):
# #
def __hash__(self): def __hash__(self):
return hash(self.MetaFile) return hash(self.MetaFile)