# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
#\r
\r
-from Common.String import *\r
+from __future__ import absolute_import\r
+from Common.StringUtils import *\r
from Common.DataType import *\r
from Common.Misc import *\r
from types import *\r
-from MetaFileParser import *\r
+from .MetaFileParser import *\r
from collections import OrderedDict\r
\r
from Workspace.BuildClassObject import ModuleBuildClassObject, LibraryClassObject, PcdClassObject\r
class InfBuildData(ModuleBuildClassObject):\r
# dict used to convert PCD type in database to string used by build tool\r
_PCD_TYPE_STRING_ = {\r
- MODEL_PCD_FIXED_AT_BUILD : "FixedAtBuild",\r
- MODEL_PCD_PATCHABLE_IN_MODULE : "PatchableInModule",\r
- MODEL_PCD_FEATURE_FLAG : "FeatureFlag",\r
- MODEL_PCD_DYNAMIC : "Dynamic",\r
- MODEL_PCD_DYNAMIC_DEFAULT : "Dynamic",\r
- MODEL_PCD_DYNAMIC_HII : "DynamicHii",\r
- MODEL_PCD_DYNAMIC_VPD : "DynamicVpd",\r
- MODEL_PCD_DYNAMIC_EX : "DynamicEx",\r
- MODEL_PCD_DYNAMIC_EX_DEFAULT : "DynamicEx",\r
- MODEL_PCD_DYNAMIC_EX_HII : "DynamicExHii",\r
- MODEL_PCD_DYNAMIC_EX_VPD : "DynamicExVpd",\r
+ MODEL_PCD_FIXED_AT_BUILD : TAB_PCDS_FIXED_AT_BUILD,\r
+ MODEL_PCD_PATCHABLE_IN_MODULE : TAB_PCDS_PATCHABLE_IN_MODULE,\r
+ MODEL_PCD_FEATURE_FLAG : TAB_PCDS_FEATURE_FLAG,\r
+ MODEL_PCD_DYNAMIC : TAB_PCDS_DYNAMIC,\r
+ MODEL_PCD_DYNAMIC_DEFAULT : TAB_PCDS_DYNAMIC,\r
+ MODEL_PCD_DYNAMIC_HII : TAB_PCDS_DYNAMIC_HII,\r
+ MODEL_PCD_DYNAMIC_VPD : TAB_PCDS_DYNAMIC_VPD,\r
+ MODEL_PCD_DYNAMIC_EX : TAB_PCDS_DYNAMIC_EX,\r
+ MODEL_PCD_DYNAMIC_EX_DEFAULT : TAB_PCDS_DYNAMIC_EX,\r
+ MODEL_PCD_DYNAMIC_EX_HII : TAB_PCDS_DYNAMIC_EX_HII,\r
+ MODEL_PCD_DYNAMIC_EX_VPD : TAB_PCDS_DYNAMIC_EX_VPD,\r
}\r
\r
# dict used to convert part of [Defines] to members of InfBuildData directly\r
# dict used to convert old tool name used in [nmake] section to new ones\r
_TOOL_CODE_ = {\r
"C" : "CC",\r
- "LIB" : "SLINK",\r
+ BINARY_FILE_TYPE_LIB : "SLINK",\r
"LINK" : "DLINK",\r
}\r
\r
CName = Record[0]\r
Value = ProtocolValue(CName, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of Protocol [%s] is not found under [Protocols] section in" % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
CName = Record[0]\r
Value = PpiValue(CName, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of PPI [%s] is not found under [Ppis] section in " % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
CName = Record[0]\r
Value = GuidValue(CName, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of Guid [%s] is not found under [Guids] section in" % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
Depex[Arch, ModuleType] = []\r
DepexList = Depex[Arch, ModuleType]\r
for Token in TokenList:\r
- if Token in DEPEX_SUPPORTED_OPCODE:\r
+ if Token in DEPEX_SUPPORTED_OPCODE_SET:\r
DepexList.append(Token)\r
elif Token.endswith(".inf"): # module file name\r
ModuleFile = os.path.normpath(Token)\r
if Value is None:\r
Value = GuidValue(Token, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of [%s] is not found in" % Token,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
if TokenSpaceGuid not in self.Guids:\r
Value = GuidValue(TokenSpaceGuid, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- PackageList = "\n\t".join([str(P) for P in self.Packages])\r
+ PackageList = "\n\t".join(str(P) for P in self.Packages)\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
"Value of Guid [%s] is not found under [Guids] section in" % TokenSpaceGuid,\r
ExtraData=PackageList, File=self.MetaFile, Line=LineNo)\r
# if platform doesn't give its type, use 'lowest' one in the\r
# following order, if any\r
#\r
- # "FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"\r
+ # TAB_PCDS_FIXED_AT_BUILD, TAB_PCDS_PATCHABLE_IN_MODULE, TAB_PCDS_FEATURE_FLAG, TAB_PCDS_DYNAMIC, TAB_PCDS_DYNAMIC_EX\r
#\r
_GuidDict.update(Package.Guids)\r
PcdType = self._PCD_TYPE_STRING_[Type]\r
if Type == MODEL_PCD_DYNAMIC:\r
Pcd.Pending = True\r
- for T in ["FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"]:\r
+ for T in PCD_TYPE_LIST:\r
if (PcdRealName, TokenSpaceGuid) in GlobalData.MixedPcd:\r
for item in GlobalData.MixedPcd[(PcdRealName, TokenSpaceGuid)]:\r
if str(item[0]).endswith(T) and (item[0], item[1], T) in Package.Pcds:\r
Pcd.DatumType = PcdInPackage.DatumType\r
Pcd.MaxDatumSize = PcdInPackage.MaxDatumSize\r
Pcd.InfDefaultValue = Pcd.DefaultValue\r
- if Pcd.DefaultValue in [None, '']:\r
+ if not Pcd.DefaultValue:\r
Pcd.DefaultValue = PcdInPackage.DefaultValue\r
else:\r
try:\r
Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, _GuidDict)(True)\r
- except BadExpression, Value:\r
+ except BadExpression as 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
break\r
FORMAT_INVALID,\r
"PCD [%s.%s] in [%s] is not found in dependent packages:" % (TokenSpaceGuid, PcdRealName, self.MetaFile),\r
File=self.MetaFile, Line=LineNo,\r
- ExtraData="\t%s" % '\n\t'.join([str(P) for P in self.Packages])\r
+ ExtraData="\t%s" % '\n\t'.join(str(P) for P in self.Packages)\r
)\r
Pcds[PcdCName, TokenSpaceGuid] = Pcd\r
\r
projects / mirror_edk2.git / blobdiff