#TAB_DSC_DEFINES_OUTPUT_DIRECTORY : "_OutputDirectory",\r
#TAB_DSC_DEFINES_SUPPORTED_ARCHITECTURES : "_SupArchList",\r
#TAB_DSC_DEFINES_BUILD_TARGETS : "_BuildTargets",\r
- #TAB_DSC_DEFINES_SKUID_IDENTIFIER : "_SkuName",\r
+ TAB_DSC_DEFINES_SKUID_IDENTIFIER : "_SkuName",\r
#TAB_DSC_DEFINES_FLASH_DEFINITION : "_FlashDefinition",\r
TAB_DSC_DEFINES_BUILD_NUMBER : "_BuildNumber",\r
TAB_DSC_DEFINES_MAKEFILE_NAME : "_MakefileName",\r
self._SupArchList = None\r
self._BuildTargets = None\r
self._SkuName = None\r
+ self._SkuIdentifier = None\r
+ self._PcdInfoFlag = None\r
self._FlashDefinition = None\r
self._BuildNumber = None\r
self._MakefileName = None\r
for Record in RecordList:\r
Name = Record[1]\r
# items defined _PROPERTY_ don't need additional processing\r
- if Name in self:\r
- self[Name] = Record[2]\r
+ \r
# some special items in [Defines] section need special treatment\r
- elif Name == TAB_DSC_DEFINES_OUTPUT_DIRECTORY:\r
+ if Name == TAB_DSC_DEFINES_OUTPUT_DIRECTORY:\r
self._OutputDirectory = NormPath(Record[2], self._Macros)\r
if ' ' in self._OutputDirectory:\r
EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "No space is allowed in OUTPUT_DIRECTORY",\r
elif Name == TAB_DSC_DEFINES_SKUID_IDENTIFIER:\r
if self._SkuName == None:\r
self._SkuName = Record[2]\r
+ self._SkuIdentifier = Record[2]\r
+ elif Name == TAB_DSC_DEFINES_PCD_INFO_GENERATION:\r
+ self._PcdInfoFlag = Record[2]\r
elif Name == TAB_FIX_LOAD_TOP_MEMORY_ADDRESS:\r
try:\r
self._LoadFixAddress = int (Record[2], 0)\r
except:\r
EdkLogger.error("build", FORMAT_INVALID, "Invalid GUID format for VPD_TOOL_GUID", File=self.MetaFile)\r
self._VpdToolGuid = Record[2] \r
+ elif Name in self:\r
+ self[Name] = Record[2] \r
# set _Header to non-None in order to avoid database re-querying\r
self._Header = 'DUMMY'\r
\r
if self._BuildTargets == None:\r
EdkLogger.error('build', ATTRIBUTE_NOT_AVAILABLE, "No BUILD_TARGETS", File=self.MetaFile)\r
return self._BuildTargets\r
-\r
+ \r
+ def _GetPcdInfoFlag(self):\r
+ if self._PcdInfoFlag == None or self._PcdInfoFlag.upper() == 'FALSE':\r
+ return False\r
+ elif self._PcdInfoFlag.upper() == 'TRUE':\r
+ return True\r
+ else:\r
+ return False\r
+ \r
+ def _GetSkuIdentifier(self):\r
+ if self._SkuIdentifier == None:\r
+ if self._Header == None:\r
+ self._GetHeaderInfo()\r
+ return self._SkuIdentifier\r
## Retrieve SKUID_IDENTIFIER\r
def _GetSkuName(self):\r
if self._SkuName == None:\r
if Record[1] in [None, '']:\r
EdkLogger.error('build', FORMAT_INVALID, 'No Sku ID name',\r
File=self.MetaFile, Line=Record[-1])\r
- self._SkuIds[Record[1]] = Record[0]\r
+ self._SkuIds[Record[1].upper()] = Record[0]\r
if 'DEFAULT' not in self._SkuIds:\r
self._SkuIds['DEFAULT'] = '0'\r
+ if 'COMMON' not in self._SkuIds:\r
+ self._SkuIds['COMMON'] = '0'\r
return self._SkuIds\r
\r
## Retrieve [Components] section information\r
# tdict is a special dict kind of type, used for selecting correct\r
# PCD settings for certain ARCH\r
#\r
+ \r
+ SkuObj = SkuClass(self.SkuIdentifier,self.SkuIds)\r
+ \r
PcdDict = tdict(True, 3)\r
PcdSet = set()\r
# Find out all possible PCD candidates for self._Arch\r
RecordList = self._RawData[Type, self._Arch]\r
+ PcdValueDict = sdict()\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
- PcdSet.add((PcdCName, TokenSpaceGuid, Dummy4))\r
- PcdDict[Arch, PcdCName, TokenSpaceGuid] = Setting\r
- # Remove redundant PCD candidates\r
- for PcdCName, TokenSpaceGuid, Dummy4 in PcdSet:\r
- Setting = PcdDict[self._Arch, PcdCName, TokenSpaceGuid]\r
+ SkuName = SkuName.upper()\r
+ if SkuName in (SkuObj.SystemSkuId,'DEFAULT','COMMON'):\r
+ PcdSet.add((PcdCName, TokenSpaceGuid, SkuName,Dummy4))\r
+ PcdDict[Arch, PcdCName, TokenSpaceGuid,SkuName] = Setting\r
+ \r
+ #handle pcd value override \r
+ for PcdCName, TokenSpaceGuid, SkuName,Dummy4 in PcdSet:\r
+ Setting = PcdDict[self._Arch, PcdCName, TokenSpaceGuid,SkuName]\r
if Setting == None:\r
continue\r
PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
+ if (PcdCName, TokenSpaceGuid) in PcdValueDict:\r
+ PcdValueDict[PcdCName, TokenSpaceGuid][SkuName] = (PcdValue,DatumType,MaxDatumSize) \r
+ else:\r
+ PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue,DatumType,MaxDatumSize)} \r
+ \r
+ PcdsKeys = PcdValueDict.keys()\r
+ for PcdCName,TokenSpaceGuid in PcdsKeys:\r
+ \r
+ PcdSetting = PcdValueDict[PcdCName, TokenSpaceGuid]\r
+ PcdValue = None\r
+ DatumType = None\r
+ MaxDatumSize = None\r
+ if 'COMMON' in PcdSetting:\r
+ PcdValue,DatumType,MaxDatumSize = PcdSetting['COMMON']\r
+ if 'DEFAULT' in PcdSetting:\r
+ PcdValue,DatumType,MaxDatumSize = PcdSetting['DEFAULT']\r
+ if SkuObj.SystemSkuId in PcdSetting:\r
+ PcdValue,DatumType,MaxDatumSize = PcdSetting[SkuObj.SystemSkuId]\r
+ \r
Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
PcdCName,\r
TokenSpaceGuid,\r
# @retval a dict object contains settings of given PCD type\r
#\r
def _GetDynamicPcd(self, Type):\r
+ \r
+ SkuObj = SkuClass(self.SkuIdentifier,self.SkuIds)\r
+ \r
Pcds = sdict()\r
#\r
# tdict is a special dict kind of type, used for selecting correct\r
PcdList = []\r
# Find out all possible PCD candidates for self._Arch\r
RecordList = self._RawData[Type, self._Arch]\r
+ AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
+ \r
+ AvailableSkuIdSet.update({'DEFAULT':0,'COMMON':0})\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
- PcdList.append((PcdCName, TokenSpaceGuid, Dummy4))\r
+ SkuName = SkuName.upper()\r
+ if SkuName not in AvailableSkuIdSet:\r
+ continue\r
+ \r
+ PcdList.append((PcdCName, TokenSpaceGuid, SkuName,Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
# Remove redundant PCD candidates, per the ARCH and SKU\r
- for PcdCName, TokenSpaceGuid, Dummy4 in PcdList:\r
- Setting = PcdDict[self._Arch, self.SkuName, PcdCName, TokenSpaceGuid]\r
+ for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdList:\r
+ \r
+ Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid]\r
if Setting == None:\r
continue\r
\r
PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName], '', '', '', '', '', PcdValue)\r
+ if (PcdCName,TokenSpaceGuid) in Pcds.keys(): \r
+ pcdObject = Pcds[PcdCName,TokenSpaceGuid]\r
+ pcdObject.SkuInfoList[SkuName] = SkuInfo\r
+ else: \r
+ Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
+ PcdCName,\r
+ TokenSpaceGuid,\r
+ self._PCD_TYPE_STRING_[Type],\r
+ DatumType,\r
+ PcdValue,\r
+ '',\r
+ MaxDatumSize,\r
+ {SkuName : SkuInfo},\r
+ False,\r
+ None\r
+ )\r
+ \r
+ for pcd in Pcds.values():\r
+ if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+ pcdDecObject = self._DecPcds[pcd.TokenCName,pcd.TokenSpaceGuidCName]\r
+ valuefromDec = pcdDecObject.DefaultValue\r
+ SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', '', valuefromDec)\r
+ pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
+ elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+ pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
+ del(pcd.SkuInfoList['COMMON'])\r
+ elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+ del(pcd.SkuInfoList['COMMON'])\r
+ if SkuObj.SkuUsageType == SkuObj.SINGLE:\r
+ if 'DEFAULT' in pcd.SkuInfoList.keys() and SkuObj.SystemSkuId not in pcd.SkuInfoList.keys():\r
+ pcd.SkuInfoList[SkuObj.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\r
+ del(pcd.SkuInfoList['DEFAULT'])\r
+ \r
+ if SkuObj.SkuUsageType == SkuObj.MULTIPLE:\r
+ if pcd.DatumType == "VOID*": \r
+ MaxSize = int(pcd.MaxDatumSize,0)\r
+ for (skuname,skuobj) in pcd.SkuInfoList.items():\r
+ datalen = len(skuobj.DefaultValue)\r
+ if datalen>MaxSize:\r
+ MaxSize = datalen\r
+ pcd.MaxDatumSize = str(MaxSize)\r
+ \r
\r
- SkuInfo = SkuInfoClass(self.SkuName, self.SkuIds[self.SkuName], '', '', '', '', '', PcdValue)\r
- Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
- PcdCName,\r
- TokenSpaceGuid,\r
- self._PCD_TYPE_STRING_[Type],\r
- DatumType,\r
- PcdValue,\r
- '',\r
- MaxDatumSize,\r
- {self.SkuName : SkuInfo},\r
- False,\r
- None\r
- )\r
return Pcds\r
\r
## Retrieve dynamic HII PCD settings\r
# @retval a dict object contains settings of given PCD type\r
#\r
def _GetDynamicHiiPcd(self, Type):\r
+ \r
+ SkuObj = SkuClass(self.SkuIdentifier,self.SkuIds)\r
+ \r
Pcds = sdict()\r
#\r
# tdict is a special dict kind of type, used for selecting correct\r
PcdSet = set()\r
RecordList = self._RawData[Type, self._Arch]\r
# Find out all possible PCD candidates for self._Arch\r
+ AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
+ \r
+ AvailableSkuIdSet.update({'DEFAULT':0,'COMMON':0})\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
- PcdSet.add((PcdCName, TokenSpaceGuid, Dummy4))\r
+ SkuName = SkuName.upper()\r
+ if SkuName not in AvailableSkuIdSet:\r
+ continue\r
+ PcdSet.add((PcdCName, TokenSpaceGuid, SkuName,Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
# Remove redundant PCD candidates, per the ARCH and SKU\r
- for PcdCName, TokenSpaceGuid, Dummy4 in PcdSet:\r
- Setting = PcdDict[self._Arch, self.SkuName, PcdCName, TokenSpaceGuid]\r
+ for PcdCName, TokenSpaceGuid,SkuName, Dummy4 in PcdSet:\r
+ \r
+ Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid]\r
if Setting == None:\r
continue\r
VariableName, VariableGuid, VariableOffset, DefaultValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
- SkuInfo = SkuInfoClass(self.SkuName, self.SkuIds[self.SkuName], VariableName, VariableGuid, VariableOffset, DefaultValue)\r
- Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName], VariableName, VariableGuid, VariableOffset, DefaultValue)\r
+ if (PcdCName,TokenSpaceGuid) in Pcds.keys(): \r
+ pcdObject = Pcds[PcdCName,TokenSpaceGuid]\r
+ pcdObject.SkuInfoList[SkuName] = SkuInfo\r
+ else:\r
+ Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
PcdCName,\r
TokenSpaceGuid,\r
self._PCD_TYPE_STRING_[Type],\r
DefaultValue,\r
'',\r
'',\r
- {self.SkuName : SkuInfo},\r
+ {SkuName : SkuInfo},\r
False,\r
None\r
)\r
+ \r
+\r
+ for pcd in Pcds.values():\r
+ SkuInfoObj = pcd.SkuInfoList.values()[0]\r
+ if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+ pcdDecObject = self._DecPcds[pcd.TokenCName,pcd.TokenSpaceGuidCName]\r
+ valuefromDec = pcdDecObject.DefaultValue\r
+ SkuInfo = SkuInfoClass('DEFAULT', '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec)\r
+ pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
+ elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+ pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
+ del(pcd.SkuInfoList['COMMON'])\r
+ elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+ del(pcd.SkuInfoList['COMMON'])\r
+ \r
+ if SkuObj.SkuUsageType == SkuObj.SINGLE:\r
+ if 'DEFAULT' in pcd.SkuInfoList.keys() and SkuObj.SystemSkuId not in pcd.SkuInfoList.keys():\r
+ pcd.SkuInfoList[SkuObj.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\r
+ del(pcd.SkuInfoList['DEFAULT'])\r
return Pcds\r
\r
## Retrieve dynamic VPD PCD settings\r
# @retval a dict object contains settings of given PCD type\r
#\r
def _GetDynamicVpdPcd(self, Type):\r
+ \r
+ SkuObj = SkuClass(self.SkuIdentifier,self.SkuIds)\r
+ \r
Pcds = sdict()\r
#\r
# tdict is a special dict kind of type, used for selecting correct\r
PcdList = []\r
# Find out all possible PCD candidates for self._Arch\r
RecordList = self._RawData[Type, self._Arch]\r
+ AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
+ \r
+ AvailableSkuIdSet.update({'DEFAULT':0,'COMMON':0})\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
- PcdList.append((PcdCName, TokenSpaceGuid, Dummy4))\r
+ SkuName = SkuName.upper()\r
+ if SkuName not in AvailableSkuIdSet:\r
+ continue\r
+\r
+ PcdList.append((PcdCName, TokenSpaceGuid,SkuName, Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
# Remove redundant PCD candidates, per the ARCH and SKU\r
- for PcdCName, TokenSpaceGuid, Dummy4 in PcdList:\r
- Setting = PcdDict[self._Arch, self.SkuName, PcdCName, TokenSpaceGuid]\r
+ for PcdCName, TokenSpaceGuid, SkuName,Dummy4 in PcdList:\r
+ Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid]\r
if Setting == None:\r
continue\r
#\r
# until the DEC parser has been called.\r
# \r
VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
-\r
- SkuInfo = SkuInfoClass(self.SkuName, self.SkuIds[self.SkuName], '', '', '', '', VpdOffset, InitialValue)\r
- Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName], '', '', '', '', VpdOffset, InitialValue)\r
+ if (PcdCName,TokenSpaceGuid) in Pcds.keys(): \r
+ pcdObject = Pcds[PcdCName,TokenSpaceGuid]\r
+ pcdObject.SkuInfoList[SkuName] = SkuInfo\r
+ else:\r
+ Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
PcdCName,\r
TokenSpaceGuid,\r
self._PCD_TYPE_STRING_[Type],\r
'',\r
'',\r
MaxDatumSize,\r
- {self.SkuName : SkuInfo},\r
+ {SkuName : SkuInfo},\r
False,\r
None\r
)\r
+ for pcd in Pcds.values():\r
+ SkuInfoObj = pcd.SkuInfoList.values()[0]\r
+ if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+ pcdDecObject = self._DecPcds[pcd.TokenCName,pcd.TokenSpaceGuidCName]\r
+ valuefromDec = pcdDecObject.DefaultValue\r
+ SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '','',SkuInfoObj.VpdOffset, valuefromDec)\r
+ pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
+ elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+ pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
+ del(pcd.SkuInfoList['COMMON'])\r
+ elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+ del(pcd.SkuInfoList['COMMON'])\r
+ if SkuObj.SkuUsageType == SkuObj.SINGLE:\r
+ if 'DEFAULT' in pcd.SkuInfoList.keys() and SkuObj.SystemSkuId not in pcd.SkuInfoList.keys():\r
+ pcd.SkuInfoList[SkuObj.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\r
+ del(pcd.SkuInfoList['DEFAULT'])\r
+ \r
+ if SkuObj.SkuUsageType == SkuObj.MULTIPLE:\r
+ if pcd.MaxDatumSize.strip(): \r
+ MaxSize = int(pcd.MaxDatumSize,0)\r
+ for (skuname,skuobj) in pcd.SkuInfoList.items():\r
+ datalen = len(skuobj.DefaultValue)\r
+ if datalen>MaxSize:\r
+ MaxSize = datalen\r
+ pcd.MaxDatumSize = str(MaxSize)\r
return Pcds\r
\r
## Add external modules\r
SupArchList = property(_GetSupArch)\r
BuildTargets = property(_GetBuildTarget)\r
SkuName = property(_GetSkuName, _SetSkuName)\r
+ SkuIdentifier = property(_GetSkuIdentifier)\r
+ PcdInfoFlag = property(_GetPcdInfoFlag)\r
FlashDefinition = property(_GetFdfFile)\r
BuildNumber = property(_GetBuildNumber)\r
MakefileName = property(_GetMakefileName)\r
\r
## Set all internal used members of InfBuildData to None\r
def _Clear(self):\r
+ self._HeaderComments = None\r
self._Header_ = None\r
self._AutoGenVersion = None\r
self._BaseName = None\r
self._LibraryClasses = None\r
self._Libraries = None\r
self._Protocols = None\r
+ self._ProtocolComments = None\r
self._Ppis = None\r
+ self._PpiComments = None\r
self._Guids = None\r
+ self._GuidsUsedByPcd = sdict()\r
+ self._GuidComments = None\r
self._Includes = None\r
self._Packages = None\r
self._Pcds = None\r
+ self._PcdComments = None\r
self._BuildOptions = None\r
self._Depex = None\r
self._DepexExpression = None\r
return\r
self._Platform = Value\r
self._Clear()\r
+ def _GetHeaderComments(self):\r
+ if not self._HeaderComments:\r
+ self._HeaderComments = []\r
+ RecordList = self._RawData[MODEL_META_DATA_HEADER_COMMENT]\r
+ for Record in RecordList:\r
+ self._HeaderComments.append(Record[0])\r
+ return self._HeaderComments\r
\r
## Retrieve all information in [Defines] section\r
#\r
self._Libraries.append(LibraryName)\r
return self._Libraries\r
\r
+ def _GetProtocolComments(self):\r
+ self._GetProtocols()\r
+ return self._ProtocolComments\r
## Retrieve protocols consumed/produced by this module\r
def _GetProtocols(self):\r
if self._Protocols == None:\r
self._Protocols = sdict()\r
+ self._ProtocolComments = sdict()\r
RecordList = self._RawData[MODEL_EFI_PROTOCOL, self._Arch, self._Platform]\r
for Record in RecordList:\r
CName = Record[0]\r
"Value of Protocol [%s] is not found under [Protocols] section in" % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
self._Protocols[CName] = Value\r
+ CommentRecords = self._RawData[MODEL_META_DATA_COMMENT, self._Arch, self._Platform, Record[5]]\r
+ Comments = []\r
+ for CmtRec in CommentRecords:\r
+ Comments.append(CmtRec[0])\r
+ self._ProtocolComments[CName] = Comments\r
return self._Protocols\r
\r
+ def _GetPpiComments(self):\r
+ self._GetPpis()\r
+ return self._PpiComments\r
## Retrieve PPIs consumed/produced by this module\r
def _GetPpis(self):\r
if self._Ppis == None:\r
self._Ppis = sdict()\r
+ self._PpiComments = sdict()\r
RecordList = self._RawData[MODEL_EFI_PPI, self._Arch, self._Platform]\r
for Record in RecordList:\r
CName = Record[0]\r
"Value of PPI [%s] is not found under [Ppis] section in " % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
self._Ppis[CName] = Value\r
+ CommentRecords = self._RawData[MODEL_META_DATA_COMMENT, self._Arch, self._Platform, Record[5]]\r
+ Comments = []\r
+ for CmtRec in CommentRecords:\r
+ Comments.append(CmtRec[0])\r
+ self._PpiComments[CName] = Comments\r
return self._Ppis\r
\r
+ def _GetGuidComments(self):\r
+ self._GetGuids()\r
+ return self._GuidComments\r
## Retrieve GUIDs consumed/produced by this module\r
def _GetGuids(self):\r
if self._Guids == None:\r
self._Guids = sdict()\r
+ self._GuidComments = sdict()\r
RecordList = self._RawData[MODEL_EFI_GUID, self._Arch, self._Platform]\r
for Record in RecordList:\r
CName = Record[0]\r
"Value of Guid [%s] is not found under [Guids] section in" % CName,\r
ExtraData=PackageList, File=self.MetaFile, Line=Record[-1])\r
self._Guids[CName] = Value\r
+ CommentRecords = self._RawData[MODEL_META_DATA_COMMENT, self._Arch, self._Platform, Record[5]]\r
+ Comments = []\r
+ for CmtRec in CommentRecords:\r
+ Comments.append(CmtRec[0])\r
+ self._GuidComments[CName] = Comments\r
return self._Guids\r
\r
## Retrieve include paths necessary for this module (for Edk.x style of modules)\r
self._Packages.append(Package)\r
return self._Packages\r
\r
+ ## Retrieve PCD comments\r
+ def _GetPcdComments(self):\r
+ self._GetPcds()\r
+ return self._PcdComments\r
## Retrieve PCDs used in this module\r
def _GetPcds(self):\r
if self._Pcds == None:\r
self._Pcds = sdict()\r
+ self._PcdComments = sdict()\r
self._Pcds.update(self._GetPcd(MODEL_PCD_FIXED_AT_BUILD))\r
self._Pcds.update(self._GetPcd(MODEL_PCD_PATCHABLE_IN_MODULE))\r
self._Pcds.update(self._GetPcd(MODEL_PCD_FEATURE_FLAG))\r
self._DepexExpression[Arch, ModuleType] = DepexExpression[Arch, ModuleType]\r
return self._DepexExpression\r
\r
+ def GetGuidsUsedByPcd(self):\r
+ return self._GuidsUsedByPcd\r
## Retrieve PCD for given type\r
def _GetPcd(self, Type):\r
Pcds = sdict()\r
PcdDict = tdict(True, 4)\r
PcdList = []\r
RecordList = self._RawData[Type, self._Arch, self._Platform]\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, Platform, Dummy1, LineNo in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, Platform, Id, LineNo in RecordList:\r
PcdDict[Arch, Platform, PcdCName, TokenSpaceGuid] = (Setting, LineNo)\r
PcdList.append((PcdCName, TokenSpaceGuid))\r
# get the guid value\r
"Value of Guid [%s] is not found under [Guids] section in" % TokenSpaceGuid,\r
ExtraData=PackageList, File=self.MetaFile, Line=LineNo)\r
self.Guids[TokenSpaceGuid] = Value\r
+ self._GuidsUsedByPcd[TokenSpaceGuid] = Value\r
+ CommentRecords = self._RawData[MODEL_META_DATA_COMMENT, self._Arch, self._Platform, Id]\r
+ Comments = []\r
+ for CmtRec in CommentRecords:\r
+ Comments.append(CmtRec[0])\r
+ self._PcdComments[TokenSpaceGuid, PcdCName] = Comments\r
\r
# resolve PCD type, value, datum info, etc. by getting its definition from package\r
for PcdCName, TokenSpaceGuid in PcdList:\r
False,\r
self.Guids[TokenSpaceGuid]\r
)\r
+ if Type == MODEL_PCD_PATCHABLE_IN_MODULE and ValueList[1]:\r
+ # Patch PCD: TokenSpace.PcdCName|Value|Offset\r
+ Pcd.Offset = ValueList[1]\r
\r
# get necessary info from package declaring this PCD\r
for Package in self.Packages:\r
\r
return Pcds\r
\r
- _Macros = property(_GetMacros)\r
- Arch = property(_GetArch, _SetArch)\r
- Platform = property(_GetPlatform, _SetPlatform)\r
+ ## check whether current module is binary module\r
+ def _IsBinaryModule(self):\r
+ if self.Binaries and not self.Sources:\r
+ return True\r
+ elif GlobalData.gIgnoreSource:\r
+ return True\r
+ else:\r
+ return False\r
+\r
+ _Macros = property(_GetMacros)\r
+ Arch = property(_GetArch, _SetArch)\r
+ Platform = property(_GetPlatform, _SetPlatform)\r
\r
+ HeaderComments = property(_GetHeaderComments)\r
AutoGenVersion = property(_GetInfVersion)\r
BaseName = property(_GetBaseName)\r
ModuleType = property(_GetModuleType)\r
LibraryClasses = property(_GetLibraryClassUses)\r
Libraries = property(_GetLibraryNames)\r
Protocols = property(_GetProtocols)\r
+ ProtocolComments = property(_GetProtocolComments)\r
Ppis = property(_GetPpis)\r
+ PpiComments = property(_GetPpiComments)\r
Guids = property(_GetGuids)\r
+ GuidComments = property(_GetGuidComments)\r
Includes = property(_GetIncludes)\r
Packages = property(_GetPackages)\r
Pcds = property(_GetPcds)\r
+ PcdComments = property(_GetPcdComments)\r
BuildOptions = property(_GetBuildOptions)\r
Depex = property(_GetDepex)\r
DepexExpression = property(_GetDepexExpression)\r
+ IsBinaryModule = property(_IsBinaryModule)\r
\r
## Database\r
#\r
projects / mirror_edk2.git / blobdiff