## @file\r
# This file is used to create a database used by build tool\r
#\r
-# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
\r
import Common.EdkLogger as EdkLogger\r
import Common.GlobalData as GlobalData\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
\r
from Common.String import *\r
from Common.DataType import *\r
self._PcdInfoFlag = None\r
self._VarCheckFlag = None\r
self._FlashDefinition = None\r
+ self._Prebuild = None\r
+ self._Postbuild = None\r
self._BuildNumber = None\r
self._MakefileName = None\r
self._BsBaseAddress = None\r
ModuleFile = PathClass(NormPath(Record[0]), GlobalData.gWorkspace, Arch=self._Arch)\r
RecordList = self._RawData[MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH, self._Arch, None, ModuleId]\r
if RecordList != []:\r
- SourceOverridePath = os.path.join(GlobalData.gWorkspace, NormPath(RecordList[0][0]))\r
+ SourceOverridePath = mws.join(GlobalData.gWorkspace, NormPath(RecordList[0][0]))\r
\r
# Check if the source override path exists\r
if not os.path.isdir(SourceOverridePath):\r
if ErrorCode != 0:\r
EdkLogger.error('build', ErrorCode, File=self.MetaFile, Line=Record[-1],\r
ExtraData=ErrorInfo)\r
+ elif Name == TAB_DSC_PREBUILD:\r
+ PrebuildValue = Record[2]\r
+ if Record[2][0] == '"':\r
+ if Record[2][-1] != '"':\r
+ EdkLogger.error('build', FORMAT_INVALID, 'Missing double quotes in the end of %s statement.' % TAB_DSC_PREBUILD,\r
+ File=self.MetaFile, Line=Record[-1])\r
+ PrebuildValue = Record[2][1:-1]\r
+ self._Prebuild = PrebuildValue\r
+ elif Name == TAB_DSC_POSTBUILD:\r
+ PostbuildValue = Record[2]\r
+ if Record[2][0] == '"':\r
+ if Record[2][-1] != '"':\r
+ EdkLogger.error('build', FORMAT_INVALID, 'Missing double quotes in the end of %s statement.' % TAB_DSC_POSTBUILD,\r
+ File=self.MetaFile, Line=Record[-1])\r
+ PostbuildValue = Record[2][1:-1]\r
+ self._Postbuild = PostbuildValue\r
elif Name == TAB_DSC_DEFINES_SUPPORTED_ARCHITECTURES:\r
self._SupArchList = GetSplitValueList(Record[2], TAB_VALUE_SPLIT)\r
elif Name == TAB_DSC_DEFINES_BUILD_TARGETS:\r
self._FlashDefinition = ''\r
return self._FlashDefinition\r
\r
+ def _GetPrebuild(self):\r
+ if self._Prebuild == None:\r
+ if self._Header == None:\r
+ self._GetHeaderInfo()\r
+ if self._Prebuild == None:\r
+ self._Prebuild = ''\r
+ return self._Prebuild\r
+\r
+ def _GetPostbuild(self):\r
+ if self._Postbuild == None:\r
+ if self._Header == None:\r
+ self._GetHeaderInfo()\r
+ if self._Postbuild == None:\r
+ self._Postbuild = ''\r
+ return self._Postbuild\r
+\r
## Retrieve FLASH_DEFINITION\r
def _GetBuildNumber(self):\r
if self._BuildNumber == None:\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
for Record in RecordList:\r
DuplicatedFile = False\r
+\r
ModuleFile = PathClass(NormPath(Record[0], Macros), GlobalData.gWorkspace, Arch=self._Arch)\r
ModuleId = Record[5]\r
LineNo = Record[6]\r
## Retrieve [BuildOptions]\r
def _GetBuildOptions(self):\r
if self._BuildOptions == None:\r
- OverrideTool = set()\r
self._BuildOptions = sdict()\r
#\r
# Retrieve build option for EDKII and EDK style module\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, CodeBase]\r
for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4 in RecordList:\r
CurKey = (ToolChainFamily, ToolChain, CodeBase)\r
- if Option.startswith('='):\r
- OverrideTool.add(CurKey)\r
#\r
# Only flags can be appended\r
#\r
- if CurKey not in self._BuildOptions or not ToolChain.endswith('_FLAGS') or CurKey in OverrideTool:\r
+ if CurKey not in self._BuildOptions or not ToolChain.endswith('_FLAGS') or Option.startswith('='):\r
self._BuildOptions[CurKey] = Option\r
else:\r
self._BuildOptions[CurKey] += ' ' + Option\r
self._ModuleTypeOptions = sdict()\r
if (Edk, ModuleType) not in self._ModuleTypeOptions:\r
options = sdict()\r
- OverrideTool = set()\r
self._ModuleTypeOptions[Edk, ModuleType] = options\r
DriverType = '%s.%s' % (Edk, ModuleType)\r
+ CommonDriverType = '%s.%s' % ('COMMON', ModuleType)\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, DriverType]\r
for ToolChainFamily, ToolChain, Option, Arch, Type, Dummy3, Dummy4 in RecordList:\r
- if Arch == self._Arch and Type == DriverType:\r
+ if Type == DriverType or Type == CommonDriverType:\r
Key = (ToolChainFamily, ToolChain, Edk)\r
- if Option.startswith('='):\r
- OverrideTool.add(Key)\r
- if Key not in options or not ToolChain.endswith('_FLAGS') or Key in OverrideTool:\r
+ if Key not in options or not ToolChain.endswith('_FLAGS') or Option.startswith('='):\r
options[Key] = Option\r
else:\r
options[Key] += ' ' + Option\r
PcdInfoFlag = property(_GetPcdInfoFlag)\r
VarCheckFlag = property(_GetVarCheckFlag)\r
FlashDefinition = property(_GetFdfFile)\r
+ Prebuild = property(_GetPrebuild)\r
+ Postbuild = property(_GetPostbuild)\r
BuildNumber = property(_GetBuildNumber)\r
MakefileName = property(_GetMakefileName)\r
BsBaseAddress = property(_GetBsBaseAddress)\r
self._LibraryClasses = None\r
self._Pcds = None\r
self.__Macros = None\r
+ self._PrivateProtocols = None\r
+ self._PrivatePpis = None\r
+ self._PrivateGuids = None\r
+ self._PrivateIncludes = None\r
\r
## Get current effective macros\r
def _GetMacros(self):\r
# protocol defition for given ARCH\r
#\r
ProtocolDict = tdict(True)\r
+ PrivateProtocolDict = tdict(True)\r
NameList = []\r
+ PrivateNameList = []\r
+ PublicNameList = []\r
# find out all protocol definitions for specific and 'common' arch\r
RecordList = self._RawData[MODEL_EFI_PROTOCOL, self._Arch]\r
- for Name, Guid, Dummy, Arch, ID, LineNo in RecordList:\r
+ for Name, Guid, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:\r
+ if PrivateFlag == 'PRIVATE':\r
+ if Name not in PrivateNameList:\r
+ PrivateNameList.append(Name)\r
+ PrivateProtocolDict[Arch, Name] = Guid\r
+ if Name in PublicNameList:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)\r
+ else:\r
+ if Name not in PublicNameList:\r
+ PublicNameList.append(Name)\r
+ if Name in PrivateNameList:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)\r
if Name not in NameList:\r
NameList.append(Name)\r
ProtocolDict[Arch, Name] = Guid\r
# use sdict to keep the order\r
self._Protocols = sdict()\r
+ self._PrivateProtocols = sdict()\r
for Name in NameList:\r
#\r
# limit the ARCH to self._Arch, if no self._Arch found, tdict\r
# will automatically turn to 'common' ARCH for trying\r
#\r
self._Protocols[Name] = ProtocolDict[self._Arch, Name]\r
+ for Name in PrivateNameList:\r
+ self._PrivateProtocols[Name] = PrivateProtocolDict[self._Arch, Name]\r
return self._Protocols\r
\r
## Retrieve PPI definitions (name/value pairs)\r
# PPI defition for given ARCH\r
#\r
PpiDict = tdict(True)\r
+ PrivatePpiDict = tdict(True)\r
NameList = []\r
+ PrivateNameList = []\r
+ PublicNameList = []\r
# find out all PPI definitions for specific arch and 'common' arch\r
RecordList = self._RawData[MODEL_EFI_PPI, self._Arch]\r
- for Name, Guid, Dummy, Arch, ID, LineNo in RecordList:\r
+ for Name, Guid, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:\r
+ if PrivateFlag == 'PRIVATE':\r
+ if Name not in PrivateNameList:\r
+ PrivateNameList.append(Name)\r
+ PrivatePpiDict[Arch, Name] = Guid\r
+ if Name in PublicNameList:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)\r
+ else:\r
+ if Name not in PublicNameList:\r
+ PublicNameList.append(Name)\r
+ if Name in PrivateNameList:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)\r
if Name not in NameList:\r
NameList.append(Name)\r
PpiDict[Arch, Name] = Guid\r
# use sdict to keep the order\r
self._Ppis = sdict()\r
+ self._PrivatePpis = sdict()\r
for Name in NameList:\r
#\r
# limit the ARCH to self._Arch, if no self._Arch found, tdict\r
# will automatically turn to 'common' ARCH for trying\r
#\r
self._Ppis[Name] = PpiDict[self._Arch, Name]\r
+ for Name in PrivateNameList:\r
+ self._PrivatePpis[Name] = PrivatePpiDict[self._Arch, Name]\r
return self._Ppis\r
\r
## Retrieve GUID definitions (name/value pairs)\r
# GUID defition for given ARCH\r
#\r
GuidDict = tdict(True)\r
+ PrivateGuidDict = tdict(True)\r
NameList = []\r
+ PrivateNameList = []\r
+ PublicNameList = []\r
# find out all protocol definitions for specific and 'common' arch\r
RecordList = self._RawData[MODEL_EFI_GUID, self._Arch]\r
- for Name, Guid, Dummy, Arch, ID, LineNo in RecordList:\r
+ for Name, Guid, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:\r
+ if PrivateFlag == 'PRIVATE':\r
+ if Name not in PrivateNameList:\r
+ PrivateNameList.append(Name)\r
+ PrivateGuidDict[Arch, Name] = Guid\r
+ if Name in PublicNameList:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)\r
+ else:\r
+ if Name not in PublicNameList:\r
+ PublicNameList.append(Name)\r
+ if Name in PrivateNameList:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % Name, File=self.MetaFile, Line=LineNo)\r
if Name not in NameList:\r
NameList.append(Name)\r
GuidDict[Arch, Name] = Guid\r
# use sdict to keep the order\r
self._Guids = sdict()\r
+ self._PrivateGuids = sdict()\r
for Name in NameList:\r
#\r
# limit the ARCH to self._Arch, if no self._Arch found, tdict\r
# will automatically turn to 'common' ARCH for trying\r
#\r
self._Guids[Name] = GuidDict[self._Arch, Name]\r
+ for Name in PrivateNameList:\r
+ self._PrivateGuids[Name] = PrivateGuidDict[self._Arch, Name]\r
return self._Guids\r
\r
## Retrieve public include paths declared in this package\r
def _GetInclude(self):\r
if self._Includes == None:\r
self._Includes = []\r
+ self._PrivateIncludes = []\r
+ PublicInclues = []\r
RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch]\r
Macros = self._Macros\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
# avoid duplicate include path\r
if File not in self._Includes:\r
self._Includes.append(File)\r
+ if Record[4] == 'PRIVATE':\r
+ if File not in self._PrivateIncludes:\r
+ self._PrivateIncludes.append(File)\r
+ if File in PublicInclues:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % File, File=self.MetaFile, Line=LineNo)\r
+ else:\r
+ if File not in PublicInclues:\r
+ PublicInclues.append(File)\r
+ if File in self._PrivateIncludes:\r
+ EdkLogger.error('build', OPTION_CONFLICT, "Can't determine %s's attribute, it is both defined as Private and non-Private attribute in DEC file." % File, File=self.MetaFile, Line=LineNo)\r
+\r
return self._Includes\r
\r
## Retrieve library class declarations (not used in build at present)\r
LibraryClassSet = set()\r
RecordList = self._RawData[MODEL_EFI_LIBRARY_CLASS, self._Arch]\r
Macros = self._Macros\r
- for LibraryClass, File, Dummy, Arch, ID, LineNo in RecordList:\r
+ for LibraryClass, File, Dummy, Arch, PrivateFlag, ID, LineNo in RecordList:\r
File = PathClass(NormPath(File, Macros), self._PackageDir, Arch=self._Arch)\r
# check the file validation\r
ErrorCode, ErrorInfo = File.Validate()\r
PcdSet = set()\r
# find out all PCDs of the 'type'\r
RecordList = self._RawData[Type, self._Arch]\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, Dummy1, Dummy2 in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, PrivateFlag, Dummy1, Dummy2 in RecordList:\r
PcdDict[Arch, PcdCName, TokenSpaceGuid] = Setting\r
PcdSet.add((PcdCName, TokenSpaceGuid))\r
\r
if self._Defs == None:\r
self._Defs = sdict()\r
self._Defs[Name] = Value\r
+ self._Macros[Name] = Value\r
# some special items in [Defines] section need special treatment\r
elif Name in ('EFI_SPECIFICATION_VERSION', 'UEFI_SPECIFICATION_VERSION', 'EDK_RELEASE_VERSION', 'PI_SPECIFICATION_VERSION'):\r
if Name in ('EFI_SPECIFICATION_VERSION', 'UEFI_SPECIFICATION_VERSION'):\r
if self._Defs == None:\r
self._Defs = sdict()\r
self._Defs[Name] = Value\r
+ self._Macros[Name] = Value\r
\r
#\r
# Retrieve information in sections specific to Edk.x modules\r
LineNo = Record[6]\r
break\r
EdkLogger.error("build", FORMAT_NOT_SUPPORTED,\r
- "MODULE_TYPE %s is not supported for EDK II, valid values are:\n %s" % (self._ModuleType,' '.join(l for l in SUP_MODULE_LIST)), \r
+ "MODULE_TYPE %s is not supported for EDK II, valid values are:\n %s" % (self._ModuleType, ' '.join(l for l in SUP_MODULE_LIST)),\r
File=self.MetaFile, Line=LineNo)\r
if (self._Specification == None) or (not 'PI_SPECIFICATION_VERSION' in self._Specification) or (int(self._Specification['PI_SPECIFICATION_VERSION'], 16) < 0x0001000A):\r
if self._ModuleType == SUP_MODULE_SMM_CORE:\r
- EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_CORE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x0001000A", File=self.MetaFile) \r
+ EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "SMM_CORE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x0001000A", File=self.MetaFile)\r
+ if (self._Specification == None) or (not 'PI_SPECIFICATION_VERSION' in self._Specification) or (int(self._Specification['PI_SPECIFICATION_VERSION'], 16) < 0x00010032):\r
+ if self._ModuleType == SUP_MODULE_MM_CORE_STANDALONE:\r
+ EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "MM_CORE_STANDALONE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x00010032", File=self.MetaFile)\r
+ if self._ModuleType == SUP_MODULE_MM_STANDALONE:\r
+ EdkLogger.error("build", FORMAT_NOT_SUPPORTED, "MM_STANDALONE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x00010032", File=self.MetaFile)\r
if self._Defs and 'PCI_DEVICE_ID' in self._Defs and 'PCI_VENDOR_ID' in self._Defs \\r
- and 'PCI_CLASS_CODE' in self._Defs:\r
+ and 'PCI_CLASS_CODE' in self._Defs and 'PCI_REVISION' in self._Defs:\r
self._BuildType = 'UEFI_OPTIONROM'\r
+ if 'PCI_COMPRESS' in self._Defs:\r
+ if self._Defs['PCI_COMPRESS'] not in ('TRUE', 'FALSE'):\r
+ EdkLogger.error("build", FORMAT_INVALID, "Expected TRUE/FALSE for PCI_COMPRESS: %s" %self.MetaFile)\r
+\r
elif self._Defs and 'UEFI_HII_RESOURCE_SECTION' in self._Defs \\r
and self._Defs['UEFI_HII_RESOURCE_SECTION'] == 'TRUE':\r
self._BuildType = 'UEFI_HII'\r
else:\r
self._BuildType = self._ModuleType.upper()\r
- \r
+\r
if self._DxsFile:\r
File = PathClass(NormPath(self._DxsFile), self._ModuleDir, Arch=self._Arch)\r
# check the file validation\r
if not self._ComponentType:\r
EdkLogger.error("build", ATTRIBUTE_NOT_AVAILABLE,\r
"COMPONENT_TYPE is not given", File=self.MetaFile)\r
- self._BuildType = self._ComponentType.upper() \r
+ self._BuildType = self._ComponentType.upper()\r
if self._ComponentType in self._MODULE_TYPE_:\r
self._ModuleType = self._MODULE_TYPE_[self._ComponentType]\r
if self._ComponentType == 'LIBRARY':\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
Macros['PROCESSOR'] = self._Arch\r
RecordList = self._RawData[MODEL_META_DATA_NMAKE, self._Arch, self._Platform]\r
- for Name,Value,Dummy,Arch,Platform,ID,LineNo in RecordList:\r
+ for Name, Value, Dummy, Arch, Platform, ID, LineNo in RecordList:\r
Value = ReplaceMacro(Value, Macros, True)\r
if Name == "IMAGE_ENTRY_POINT":\r
if self._ModuleEntryPointList == None:\r
RecordList = self._RawData[MODEL_META_DATA_HEADER, self._Arch, self._Platform]\r
for Record in RecordList:\r
if Record[1] == TAB_INF_DEFINES_INF_VERSION:\r
- self._AutoGenVersion = int(Record[2], 0)\r
+ if '.' in Record[2]:\r
+ ValueList = Record[2].split('.')\r
+ Major = '%04o' % int(ValueList[0], 0)\r
+ Minor = '%04o' % int(ValueList[1], 0)\r
+ self._AutoGenVersion = int('0x' + Major + Minor, 0)\r
+ else:\r
+ self._AutoGenVersion = int(Record[2], 0)\r
break\r
if self._AutoGenVersion == None:\r
self._AutoGenVersion = 0x00010000\r
if self.AutoGenVersion < 0x00010005:\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
Macros['PROCESSOR'] = self._Arch\r
+ SourceFile = NormPath(Record[0], Macros)\r
+ if SourceFile[0] == os.path.sep:\r
+ SourceFile = mws.join(GlobalData.gWorkspace, SourceFile[1:])\r
# old module source files (Edk)\r
- File = PathClass(NormPath(Record[0], Macros), self._ModuleDir, self._SourceOverridePath,\r
+ File = PathClass(SourceFile, self._ModuleDir, self._SourceOverridePath,\r
'', False, self._Arch, ToolChainFamily, '', TagName, ToolCode)\r
# check the file validation\r
ErrorCode, ErrorInfo = File.Validate(CaseSensitive=False)\r
RecordList = self._RawData[MODEL_EFI_PROTOCOL, self._Arch, self._Platform]\r
for Record in RecordList:\r
CName = Record[0]\r
- Value = ProtocolValue(CName, self.Packages)\r
+ Value = ProtocolValue(CName, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
PackageList = "\n\t".join([str(P) for P in self.Packages])\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
RecordList = self._RawData[MODEL_EFI_PPI, self._Arch, self._Platform]\r
for Record in RecordList:\r
CName = Record[0]\r
- Value = PpiValue(CName, self.Packages)\r
+ Value = PpiValue(CName, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
PackageList = "\n\t".join([str(P) for P in self.Packages])\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
RecordList = self._RawData[MODEL_EFI_GUID, self._Arch, self._Platform]\r
for Record in RecordList:\r
CName = Record[0]\r
- Value = GuidValue(CName, self.Packages)\r
+ Value = GuidValue(CName, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
PackageList = "\n\t".join([str(P) for P in self.Packages])\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
if File[0] == '.':\r
File = os.path.join(self._ModuleDir, File)\r
else:\r
- File = os.path.join(GlobalData.gWorkspace, File)\r
+ File = mws.join(GlobalData.gWorkspace, File)\r
File = RealPath(os.path.normpath(File))\r
if File:\r
self._Includes.append(File)\r
+ if not File and Record[0].find('EFI_SOURCE') > -1:\r
+ # tricky to regard WorkSpace as EFI_SOURCE\r
+ Macros['EFI_SOURCE'] = GlobalData.gWorkspace\r
+ File = NormPath(Record[0], Macros)\r
+ if File[0] == '.':\r
+ File = os.path.join(self._ModuleDir, File)\r
+ else:\r
+ File = os.path.join(GlobalData.gWorkspace, File)\r
+ File = RealPath(os.path.normpath(File))\r
+ if File:\r
+ self._Includes.append(File)\r
return self._Includes\r
\r
## Retrieve packages this module depends on\r
ToolChainFamily = Record[0]\r
ToolChain = Record[1]\r
Option = Record[2]\r
- if (ToolChainFamily, ToolChain) not in self._BuildOptions:\r
+ if (ToolChainFamily, ToolChain) not in self._BuildOptions or Option.startswith('='):\r
self._BuildOptions[ToolChainFamily, ToolChain] = Option\r
else:\r
# concatenate the option string if they're for the same tool\r
DepexList.append(Module.Guid)\r
else:\r
# get the GUID value now\r
- Value = ProtocolValue(Token, self.Packages)\r
+ Value = ProtocolValue(Token, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
- Value = PpiValue(Token, self.Packages)\r
+ Value = PpiValue(Token, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
- Value = GuidValue(Token, self.Packages)\r
+ Value = GuidValue(Token, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
PackageList = "\n\t".join([str(P) for P in self.Packages])\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
PcdList.append((PcdCName, TokenSpaceGuid))\r
# get the guid value\r
if TokenSpaceGuid not in self.Guids:\r
- Value = GuidValue(TokenSpaceGuid, self.Packages)\r
+ Value = GuidValue(TokenSpaceGuid, self.Packages, self.MetaFile.Path)\r
if Value == None:\r
PackageList = "\n\t".join([str(P) for P in self.Packages])\r
EdkLogger.error('build', RESOURCE_NOT_AVAILABLE,\r
\r
# resolve PCD type, value, datum info, etc. by getting its definition from package\r
for PcdCName, TokenSpaceGuid in PcdList:\r
+ PcdRealName = PcdCName\r
Setting, LineNo = PcdDict[self._Arch, self.Platform, PcdCName, TokenSpaceGuid]\r
if Setting == None:\r
continue\r
# Patch PCD: TokenSpace.PcdCName|Value|Offset\r
Pcd.Offset = ValueList[1]\r
\r
+ if (PcdRealName, TokenSpaceGuid) in GlobalData.MixedPcd:\r
+ for Package in self.Packages:\r
+ for key in Package.Pcds:\r
+ if (Package.Pcds[key].TokenCName, Package.Pcds[key].TokenSpaceGuidCName) == (PcdRealName, TokenSpaceGuid):\r
+ for item in GlobalData.MixedPcd[(PcdRealName, TokenSpaceGuid)]:\r
+ Pcd_Type = item[0].split('_')[-1]\r
+ if Pcd_Type == Package.Pcds[key].Type:\r
+ Value = Package.Pcds[key]\r
+ Value.TokenCName = Package.Pcds[key].TokenCName + '_' + Pcd_Type\r
+ if len(key) == 2:\r
+ newkey = (Value.TokenCName, key[1])\r
+ elif len(key) == 3:\r
+ newkey = (Value.TokenCName, key[1], key[2])\r
+ del Package.Pcds[key]\r
+ Package.Pcds[newkey] = Value\r
+ break\r
+ else:\r
+ pass\r
+ else:\r
+ pass\r
+\r
# get necessary info from package declaring this PCD\r
for Package in self.Packages:\r
#\r
if Type == MODEL_PCD_DYNAMIC:\r
Pcd.Pending = True\r
for T in ["FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"]:\r
- if (PcdCName, TokenSpaceGuid, T) in Package.Pcds:\r
- PcdType = T\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
+ PcdType = T\r
+ PcdCName = item[0]\r
+ break\r
+ else:\r
+ pass\r
break\r
+ else:\r
+ if (PcdRealName, TokenSpaceGuid, T) in Package.Pcds:\r
+ PcdType = T\r
+ break\r
+\r
else:\r
Pcd.Pending = False\r
+ if (PcdRealName, TokenSpaceGuid) in GlobalData.MixedPcd:\r
+ for item in GlobalData.MixedPcd[(PcdRealName, TokenSpaceGuid)]:\r
+ Pcd_Type = item[0].split('_')[-1]\r
+ if Pcd_Type == PcdType:\r
+ PcdCName = item[0]\r
+ break\r
+ else:\r
+ pass\r
+ else:\r
+ pass\r
\r
if (PcdCName, TokenSpaceGuid, PcdType) in Package.Pcds:\r
PcdInPackage = Package.Pcds[PcdCName, TokenSpaceGuid, PcdType]\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "No TokenValue for PCD [%s.%s] in [%s]!" % (TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ "No TokenValue for PCD [%s.%s] in [%s]!" % (TokenSpaceGuid, PcdRealName, str(Package)),\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
) \r
#\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid:" % (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid:" % (Pcd.TokenValue, TokenSpaceGuid, PcdRealName, str(Package)),\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
)\r
\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, as a decimal it should between: 0 - 4294967295!"% (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, as a decimal it should between: 0 - 4294967295!" % (Pcd.TokenValue, TokenSpaceGuid, PcdRealName, str(Package)),\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
- ) \r
+ )\r
except:\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, it should be hexadecimal or decimal!"% (Pcd.TokenValue, TokenSpaceGuid, PcdCName, str(Package)),\r
- File =self.MetaFile, Line=LineNo,\r
+ "The format of TokenValue [%s] of PCD [%s.%s] in [%s] is invalid, it should be hexadecimal or decimal!" % (Pcd.TokenValue, TokenSpaceGuid, PcdRealName, str(Package)),\r
+ File=self.MetaFile, Line=LineNo,\r
ExtraData=None\r
)\r
- \r
+\r
Pcd.DatumType = PcdInPackage.DatumType\r
Pcd.MaxDatumSize = PcdInPackage.MaxDatumSize\r
Pcd.InfDefaultValue = Pcd.DefaultValue\r
EdkLogger.error(\r
'build',\r
FORMAT_INVALID,\r
- "PCD [%s.%s] in [%s] is not found in dependent packages:" % (TokenSpaceGuid, PcdCName, self.MetaFile),\r
- File =self.MetaFile, Line=LineNo,\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
)\r
Pcds[PcdCName, TokenSpaceGuid] = Pcd\r
MetaFile = self._FILE_PARSER_[FileType](\r
FilePath, \r
FileType, \r
+ Arch,\r
MetaFileStorage(self.WorkspaceDb.Cur, FilePath, FileType)\r
)\r
# alwasy do post-process, in case of macros change\r
def __init__(self, DbPath, RenewDb=False):\r
self._DbClosedFlag = False\r
if not DbPath:\r
- DbPath = os.path.normpath(os.path.join(GlobalData.gWorkspace, 'Conf', GlobalData.gDatabasePath))\r
+ DbPath = os.path.normpath(mws.join(GlobalData.gWorkspace, 'Conf', GlobalData.gDatabasePath))\r
\r
# don't create necessary path for db in memory\r
if DbPath != ':memory:':\r
## Summarize all packages in the database\r
def GetPackageList(self, Platform, Arch, TargetName, ToolChainTag):\r
self.Platform = Platform\r
- PackageList =[]\r
+ PackageList = []\r
Pa = self.BuildObject[self.Platform, 'COMMON']\r
#\r
# Get Package related to Modules\r
LibObj = self.BuildObject[Lib, Arch, TargetName, ToolChainTag]\r
for Package in LibObj.Packages:\r
if Package not in PackageList:\r
- PackageList.append(Package) \r
- \r
+ PackageList.append(Package)\r
+\r
return PackageList\r
\r
## Summarize all platforms in the database\r
PlatformList.append(Platform)\r
return PlatformList\r
\r
+ def _MapPlatform(self, Dscfile):\r
+ Platform = self.BuildObject[PathClass(Dscfile), 'COMMON']\r
+ if Platform == None:\r
+ EdkLogger.error('build', PARSER_ERROR, "Failed to parser DSC file: %s" % Dscfile)\r
+ return Platform\r
+\r
PlatformList = property(_GetPlatformList)\r
\r
##\r
projects / mirror_edk2.git / blobdiff