# 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
# 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
ExtraData=Token, File=self.MetaFile, Line=Record[-1])\r
DepexList.append(Module.Guid)\r
else:\r
- # get the GUID value now\r
- Value = ProtocolValue(Token, self.Packages, self.MetaFile.Path)\r
- if Value is None:\r
- Value = PpiValue(Token, self.Packages, self.MetaFile.Path)\r
+ # it use the Fixed PCD format\r
+ if '.' in Token:\r
+ if tuple(Token.split('.')[::-1]) not in self.Pcds:\r
+ EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "PCD [{}] used in [Depex] section should be listed in module PCD section".format(Token), File=self.MetaFile, Line=Record[-1])\r
+ else:\r
+ if self.Pcds[tuple(Token.split('.')[::-1])].DatumType != TAB_VOID:\r
+ EdkLogger.error('build', FORMAT_INVALID, "PCD [{}] used in [Depex] section should be VOID* datum type".format(Token), File=self.MetaFile, Line=Record[-1])\r
+ Value = Token\r
+ else:\r
+ # get the GUID value now\r
+ Value = ProtocolValue(Token, self.Packages, self.MetaFile.Path)\r
if Value is None:\r
- Value = GuidValue(Token, self.Packages, self.MetaFile.Path)\r
+ Value = PpiValue(Token, self.Packages, self.MetaFile.Path)\r
+ if Value is None:\r
+ Value = GuidValue(Token, self.Packages, self.MetaFile.Path)\r
+\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
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