BaseTools: Support Structure PCD value inherit between the different SKUs

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / BuildClassObject.py

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index 6150557cfbfd2a052057da963267422b1a0876c6..631c1c7b99853dd7d3553176e05306f7ae89fc10 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -16,6 +16,7 @@ import Common.LongFilePathOs as os
 from Common.Misc import sdict\r
 from Common.Misc import RealPath2\r
 from Common.BuildToolError import *\r
+from Common.DataType import *\r
 import collections\r
 \r
 ## PcdClassObject\r
@@ -108,11 +109,11 @@ class PcdClassObject(object):
         return hash((self.TokenCName, self.TokenSpaceGuidCName))\r
 \r
 class StructurePcd(PcdClassObject):\r
-    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=[]):\r
+    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):\r
         super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)\r
         self.StructuredPcdIncludeFile = StructuredPcdIncludeFile\r
         self.PackageDecs = Packages\r
-        self.DefaultStoreName = ['STANDARD']\r
+        self.DefaultStoreName = [default_store]\r
         self.DefaultValues = collections.OrderedDict({})\r
         self.PcdMode = None\r
         self.SkuOverrideValues = collections.OrderedDict({})\r
@@ -127,13 +128,15 @@ class StructurePcd(PcdClassObject):
         self.DefaultValues[FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.DefaultValues[FieldName]\r
 \r
-    def AddOverrideValue (self, FieldName, Value, SkuName, FileName="", LineNo=0):\r
+    def AddOverrideValue (self, FieldName, Value, SkuName, DefaultStoreName, FileName="", LineNo=0):\r
         if SkuName not in self.SkuOverrideValues:\r
             self.SkuOverrideValues[SkuName] = collections.OrderedDict({})\r
-        if FieldName in self.SkuOverrideValues[SkuName]:\r
-            del self.SkuOverrideValues[SkuName][FieldName]\r
-        self.SkuOverrideValues[SkuName][FieldName] = [Value.strip(), FileName, LineNo]\r
-        return self.SkuOverrideValues[SkuName][FieldName]\r
+        if DefaultStoreName not in self.SkuOverrideValues[SkuName]:\r
+            self.SkuOverrideValues[SkuName][DefaultStoreName] = collections.OrderedDict({})\r
+        if FieldName in self.SkuOverrideValues[SkuName][DefaultStoreName]:\r
+            del self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName]\r
+        self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName] = [Value.strip(), FileName, LineNo]\r
+        return self.SkuOverrideValues[SkuName][DefaultStoreName][FieldName]\r
 \r
     def SetPcdMode (self, PcdMode):\r
         self.PcdMode = PcdMode\r