From 9904222db0affb82d2aa0004dda35c3c66b74234 Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Thu, 25 Jan 2018 15:42:25 +0800 Subject: BaseTool: Fixed the StructurePcd incorrect value. 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 Cc: Liming Gao Reviewed-by: Liming Gao --- BaseTools/Source/Python/Workspace/BuildClassObject.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'BaseTools/Source/Python/Workspace/BuildClassObject.py') diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py index 83140049ed..3afb27a9c0 100644 --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py @@ -67,7 +67,7 @@ class PcdClassObject(object): self.DscDefaultValue = None if IsDsc: self.DscDefaultValue = Value - + ## Convert the class to a string # # Convert each member of the class to string @@ -109,7 +109,11 @@ class PcdClassObject(object): return hash((self.TokenCName, self.TokenSpaceGuidCName)) 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) self.StructuredPcdIncludeFile = StructuredPcdIncludeFile self.PackageDecs = Packages @@ -441,4 +445,3 @@ class PlatformBuildClassObject(object): # def __hash__(self): return hash(self.MetaFile) - -- cgit v1.2.3