BaseTools: use combined version of OrderedDict

[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 0e1161c96f647effc9d7e730ee2159548b76b611..e95a8fd24b946d92b7d5b4d730f50a391e3f667a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -13,7 +13,7 @@
 \r
 import Common.LongFilePathOs as os\r
 \r
-from Common.Misc import sdict\r
+from collections import OrderedDict\r
 from Common.Misc import RealPath2\r
 from Common.BuildToolError import *\r
 from Common.DataType import *\r
@@ -65,8 +65,11 @@ class PcdClassObject(object):
         self.validlists = validlists\r
         self.expressions = expressions\r
         self.DscDefaultValue = None\r
+        self.DscRawValue = None\r
         if IsDsc:\r
             self.DscDefaultValue = Value\r
+        self.PcdValueFromComm = ""\r
+        self.DefinitionPosition = ("","")\r
 \r
     ## Convert the class to a string\r
     #\r
@@ -114,6 +117,7 @@ class StructurePcd(PcdClassObject):
         if validateranges is None: validateranges=[]\r
         if validlists is None: validlists=[]\r
         if expressions is None : expressions=[]\r
+        if Packages is None : Packages = []\r
         super(StructurePcd, self).__init__(Name, Guid, Type, DatumType, Value, Token, MaxDatumSize, SkuInfoList, IsOverrided, GuidValue, validateranges, validlists, expressions)\r
         self.StructuredPcdIncludeFile = [] if StructuredPcdIncludeFile is None else StructuredPcdIncludeFile\r
         self.PackageDecs = Packages\r
@@ -125,6 +129,9 @@ class StructurePcd(PcdClassObject):
         self.StructName = None\r
         self.PcdDefineLineNo = 0\r
         self.PkgPath = ""\r
+        self.DefaultValueFromDec = ""\r
+        self.ValueChain = dict()\r
+        self.PcdFieldValueFromComm = collections.OrderedDict({})\r
     def __repr__(self):\r
         return self.TypeName\r
 \r
@@ -134,6 +141,8 @@ class StructurePcd(PcdClassObject):
         self.DefaultValues[FieldName] = [Value.strip(), FileName, LineNo]\r
         return self.DefaultValues[FieldName]\r
 \r
+    def SetDecDefaultValue(self,DefaultValue):\r
+        self.DefaultValueFromDec = DefaultValue\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
@@ -168,17 +177,23 @@ class StructurePcd(PcdClassObject):
         self.validateranges = PcdObject.validateranges if PcdObject.validateranges else self.validateranges\r
         self.validlists = PcdObject.validlists if PcdObject.validlists else self.validlists\r
         self.expressions = PcdObject.expressions if PcdObject.expressions else self.expressions\r
+        self.DscRawValue = PcdObject.DscRawValue if PcdObject.DscRawValue else self.DscRawValue\r
+        self.PcdValueFromComm = PcdObject.PcdValueFromComm if PcdObject.PcdValueFromComm else self.PcdValueFromComm\r
+        self.DefinitionPosition = PcdObject.DefinitionPosition if PcdObject.DefinitionPosition else self.DefinitionPosition\r
         if type(PcdObject) is StructurePcd:\r
             self.StructuredPcdIncludeFile = PcdObject.StructuredPcdIncludeFile if PcdObject.StructuredPcdIncludeFile else self.StructuredPcdIncludeFile\r
             self.PackageDecs = PcdObject.PackageDecs if PcdObject.PackageDecs else self.PackageDecs\r
             self.DefaultValues = PcdObject.DefaultValues if PcdObject.DefaultValues else self.DefaultValues\r
             self.PcdMode = PcdObject.PcdMode if PcdObject.PcdMode else self.PcdMode\r
             self.DefaultFromDSC=None\r
+            self.DefaultValueFromDec = PcdObject.DefaultValueFromDec if PcdObject.DefaultValueFromDec else self.DefaultValueFromDec\r
             self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
             self.FlexibleFieldName = PcdObject.FlexibleFieldName if PcdObject.FlexibleFieldName else self.FlexibleFieldName\r
             self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName\r
             self.PcdDefineLineNo = PcdObject.PcdDefineLineNo if PcdObject.PcdDefineLineNo else self.PcdDefineLineNo\r
             self.PkgPath = PcdObject.PkgPath if PcdObject.PkgPath else self.PkgPath\r
+            self.ValueChain = PcdObject.ValueChain if PcdObject.ValueChain else self.ValueChain\r
+            self.PcdFieldValueFromComm = PcdObject.PcdFieldValueFromComm if PcdObject.PcdFieldValueFromComm else self.PcdFieldValueFromComm\r
 \r
 ## LibraryClassObject\r
 #\r
@@ -197,7 +212,7 @@ class LibraryClassObject(object):
     def __init__(self, Name = None, SupModList = [], Type = None):\r
         self.LibraryClass = Name\r
         self.SupModList = SupModList\r
-        if Type != None:\r
+        if Type is not None:\r
             self.SupModList = CleanString(Type).split(DataType.TAB_SPACE_SPLIT)\r
 \r
 ## ModuleBuildClassObject\r
@@ -266,7 +281,7 @@ class ModuleBuildClassObject(object):
 \r
         self.Binaries                = []\r
         self.Sources                 = []\r
-        self.LibraryClasses          = sdict()\r
+        self.LibraryClasses          = OrderedDict()\r
         self.Libraries               = []\r
         self.Protocols               = []\r
         self.Ppis                    = []\r