]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/Workspace/InfBuildData.py
BaseTools: replace string constants used for module types
[mirror_edk2.git] / BaseTools / Source / Python / Workspace / InfBuildData.py
index e10873ae59033485d78a998bdb25201705703d4e..f2d36d0ee0d45215188a3b21e0764e5d44afd3e3 100644 (file)
@@ -68,22 +68,22 @@ class InfBuildData(ModuleBuildClassObject):
 \r
     # dict used to convert Component type to Module type\r
     _MODULE_TYPE_ = {\r
-        "LIBRARY"               :   "BASE",\r
-        "SECURITY_CORE"         :   "SEC",\r
-        "PEI_CORE"              :   "PEI_CORE",\r
-        "COMBINED_PEIM_DRIVER"  :   "PEIM",\r
-        "PIC_PEIM"              :   "PEIM",\r
-        "RELOCATABLE_PEIM"      :   "PEIM",\r
-        "PE32_PEIM"             :   "PEIM",\r
-        "BS_DRIVER"             :   "DXE_DRIVER",\r
-        "RT_DRIVER"             :   "DXE_RUNTIME_DRIVER",\r
-        "SAL_RT_DRIVER"         :   "DXE_SAL_DRIVER",\r
-        "DXE_SMM_DRIVER"        :   "DXE_SMM_DRIVER",\r
-    #    "SMM_DRIVER"            :   "DXE_SMM_DRIVER",\r
-    #    "BS_DRIVER"             :   "DXE_SMM_DRIVER",\r
-    #    "BS_DRIVER"             :   "UEFI_DRIVER",\r
-        "APPLICATION"           :   "UEFI_APPLICATION",\r
-        "LOGO"                  :   "BASE",\r
+        "LIBRARY"               :   SUP_MODULE_BASE,\r
+        "SECURITY_CORE"         :   SUP_MODULE_SEC,\r
+        SUP_MODULE_PEI_CORE              :   SUP_MODULE_PEI_CORE,\r
+        "COMBINED_PEIM_DRIVER"  :   SUP_MODULE_PEIM,\r
+        "PIC_PEIM"              :   SUP_MODULE_PEIM,\r
+        "RELOCATABLE_PEIM"      :   SUP_MODULE_PEIM,\r
+        "PE32_PEIM"             :   SUP_MODULE_PEIM,\r
+        "BS_DRIVER"             :   SUP_MODULE_DXE_DRIVER,\r
+        "RT_DRIVER"             :   SUP_MODULE_DXE_RUNTIME_DRIVER,\r
+        "SAL_RT_DRIVER"         :   SUP_MODULE_DXE_SAL_DRIVER,\r
+        SUP_MODULE_DXE_SMM_DRIVER        :   SUP_MODULE_DXE_SMM_DRIVER,\r
+    #    "SMM_DRIVER"            :   SUP_MODULE_DXE_SMM_DRIVER,\r
+    #    "BS_DRIVER"             :   SUP_MODULE_DXE_SMM_DRIVER,\r
+    #    "BS_DRIVER"             :   SUP_MODULE_UEFI_DRIVER,\r
+        "APPLICATION"           :   SUP_MODULE_UEFI_APPLICATION,\r
+        "LOGO"                  :   SUP_MODULE_BASE,\r
     }\r
 \r
     # regular expression for converting XXX_FLAGS in [nmake] section to new type\r
@@ -107,7 +107,7 @@ class InfBuildData(ModuleBuildClassObject):
     #   @param      Platform        The name of platform employing this module\r
     #   @param      Macros          Macros used for replacement in DSC file\r
     #\r
-    def __init__(self, FilePath, RawData, BuildDatabase, Arch='COMMON', Target=None, Toolchain=None):\r
+    def __init__(self, FilePath, RawData, BuildDatabase, Arch=TAB_ARCH_COMMON, Target=None, Toolchain=None):\r
         self.MetaFile = FilePath\r
         self._ModuleDir = FilePath.Dir\r
         self._RawData = RawData\r
@@ -115,7 +115,7 @@ class InfBuildData(ModuleBuildClassObject):
         self._Arch = Arch\r
         self._Target = Target\r
         self._Toolchain = Toolchain\r
-        self._Platform = 'COMMON'\r
+        self._Platform = TAB_COMMON\r
         self._SourceOverridePath = None\r
         if FilePath.Key in GlobalData.gOverrideDir:\r
             self._SourceOverridePath = GlobalData.gOverrideDir[FilePath.Key]\r
@@ -461,9 +461,9 @@ class InfBuildData(ModuleBuildClassObject):
             if self._Header_ is None:\r
                 self._GetHeaderInfo()\r
             if self._ModuleType is None:\r
-                self._ModuleType = 'BASE'\r
+                self._ModuleType = SUP_MODULE_BASE\r
             if self._ModuleType not in SUP_MODULE_LIST:\r
-                self._ModuleType = "USER_DEFINED"\r
+                self._ModuleType = SUP_MODULE_USER_DEFINED\r
         return self._ModuleType\r
 \r
     ## Retrieve COMPONENT_TYPE\r
@@ -472,7 +472,7 @@ class InfBuildData(ModuleBuildClassObject):
             if self._Header_ is None:\r
                 self._GetHeaderInfo()\r
             if self._ComponentType is None:\r
-                self._ComponentType = 'USER_DEFINED'\r
+                self._ComponentType = SUP_MODULE_USER_DEFINED\r
         return self._ComponentType\r
 \r
     ## Retrieve "BUILD_TYPE"\r
@@ -481,7 +481,7 @@ class InfBuildData(ModuleBuildClassObject):
             if self._Header_ is None:\r
                 self._GetHeaderInfo()\r
             if not self._BuildType:\r
-                self._BuildType = "BASE"\r
+                self._BuildType = SUP_MODULE_BASE\r
         return self._BuildType\r
 \r
     ## Retrieve file guid\r
@@ -602,7 +602,7 @@ class InfBuildData(ModuleBuildClassObject):
             for Record in RecordList:\r
                 FileType = Record[0]\r
                 LineNo = Record[-1]\r
-                Target = 'COMMON'\r
+                Target = TAB_COMMON\r
                 FeatureFlag = []\r
                 if Record[2]:\r
                     TokenList = GetSplitValueList(Record[2], TAB_VALUE_SPLIT)\r
@@ -788,10 +788,7 @@ class InfBuildData(ModuleBuildClassObject):
                 self._Includes.append(self._SourceOverridePath)\r
 \r
             Macros = self._Macros\r
-            if 'PROCESSOR' in GlobalData.gEdkGlobal.keys():\r
-                Macros['PROCESSOR'] = GlobalData.gEdkGlobal['PROCESSOR']\r
-            else:\r
-                Macros['PROCESSOR'] = self._Arch\r
+            Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', self._Arch)\r
             RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, self._Platform]\r
             for Record in RecordList:\r
                 if Record[0].find('EDK_SOURCE') > -1:\r
@@ -902,14 +899,14 @@ class InfBuildData(ModuleBuildClassObject):
 \r
             # PEIM and DXE drivers must have a valid [Depex] section\r
             if len(self.LibraryClass) == 0 and len(RecordList) == 0:\r
-                if self.ModuleType == 'DXE_DRIVER' or self.ModuleType == 'PEIM' or self.ModuleType == 'DXE_SMM_DRIVER' or \\r
-                    self.ModuleType == 'DXE_SAL_DRIVER' or self.ModuleType == 'DXE_RUNTIME_DRIVER':\r
+                if self.ModuleType == SUP_MODULE_DXE_DRIVER or self.ModuleType == SUP_MODULE_PEIM or self.ModuleType == SUP_MODULE_DXE_SMM_DRIVER or \\r
+                    self.ModuleType == SUP_MODULE_DXE_SAL_DRIVER or self.ModuleType == SUP_MODULE_DXE_RUNTIME_DRIVER:\r
                     EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "No [Depex] section or no valid expression in [Depex] section for [%s] module" \\r
                                     % self.ModuleType, File=self.MetaFile)\r
 \r
-            if len(RecordList) != 0 and self.ModuleType == 'USER_DEFINED':\r
+            if len(RecordList) != 0 and self.ModuleType == SUP_MODULE_USER_DEFINED:\r
                 for Record in RecordList:\r
-                    if Record[4] not in ['PEIM', 'DXE_DRIVER', 'DXE_SMM_DRIVER']:\r
+                    if Record[4] not in [SUP_MODULE_PEIM, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SMM_DRIVER]:\r
                         EdkLogger.error('build', FORMAT_INVALID,\r
                                         "'%s' module must specify the type of [Depex] section" % self.ModuleType,\r
                                         File=self.MetaFile)\r
@@ -997,6 +994,7 @@ class InfBuildData(ModuleBuildClassObject):
             self._PcdComments[TokenSpaceGuid, PcdCName] = Comments\r
 \r
         # resolve PCD type, value, datum info, etc. by getting its definition from package\r
+        _GuidDict = self.Guids.copy()\r
         for PcdCName, TokenSpaceGuid in PcdList:\r
             PcdRealName = PcdCName\r
             Setting, LineNo = PcdDict[self._Arch, self.Platform, PcdCName, TokenSpaceGuid]\r
@@ -1050,7 +1048,7 @@ class InfBuildData(ModuleBuildClassObject):
                 #\r
                 #   "FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"\r
                 #\r
-                self.Guids.update(Package.Guids)\r
+                _GuidDict.update(Package.Guids)\r
                 PcdType = self._PCD_TYPE_STRING_[Type]\r
                 if Type == MODEL_PCD_DYNAMIC:\r
                     Pcd.Pending = True\r
@@ -1142,7 +1140,7 @@ class InfBuildData(ModuleBuildClassObject):
                         Pcd.DefaultValue = PcdInPackage.DefaultValue\r
                     else:\r
                         try:\r
-                            Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, self.Guids)(True)\r
+                            Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, _GuidDict)(True)\r
                         except BadExpression, Value:\r
                             EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(TokenSpaceGuid, PcdRealName, Pcd.DefaultValue, Value),\r
                                             File=self.MetaFile, Line=LineNo)\r