## @file\r
# Generate AutoGen.h, AutoGen.c and *.depex files\r
#\r
-# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
# Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>\r
+# Copyright (c) 2019, American Megatrends, Inc. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
\r
from .StrGather import *\r
from .BuildEngine import BuildRule\r
-\r
+import shutil\r
from Common.LongFilePathSupport import CopyLongFilePath\r
from Common.BuildToolError import *\r
from Common.DataType import *\r
import Common.GlobalData as GlobalData\r
from GenFds.FdfParser import *\r
from CommonDataClass.CommonClass import SkuInfoClass\r
-from Workspace.BuildClassObject import *\r
from GenPatchPcdTable.GenPatchPcdTable import parsePcdInfoFromMapFile\r
import Common.VpdInfoFile as VpdInfoFile\r
from .GenPcdDb import CreatePcdDatabaseCode\r
from collections import OrderedDict\r
from collections import defaultdict\r
from Workspace.WorkspaceCommon import OrderedListDict\r
+from Common.ToolDefClassObject import gDefaultToolsDefFile\r
\r
-from Common.caching import cached_property\r
+from Common.caching import cached_property, cached_class_function\r
\r
## Regular expression for splitting Dependency Expression string into tokens\r
gDepexTokenPattern = re.compile("(\(|\)|\w+| \S+\.inf)")\r
gEfiVarStoreGuidPattern = re.compile("\s*guid\s*=\s*({.*?{.*?}\s*})")\r
\r
## Mapping Makefile type\r
-gMakeTypeMap = {"MSFT":"nmake", "GCC":"gmake"}\r
+gMakeTypeMap = {TAB_COMPILER_MSFT:"nmake", "GCC":"gmake"}\r
\r
\r
## Build rule configuration file\r
gDefaultBuildRuleFile = 'build_rule.txt'\r
\r
-## Tools definition configuration file\r
-gDefaultToolsDefFile = 'tools_def.txt'\r
-\r
## Build rule default version\r
AutoGenReqBuildRuleVerNum = "0.1"\r
\r
## @AsBuilt${BEGIN}\r
## ${flags_item}${END}\r
""")\r
+## Split command line option string to list\r
+#\r
+# subprocess.Popen needs the args to be a sequence. Otherwise there's problem\r
+# in non-windows platform to launch command\r
+#\r
+def _SplitOption(OptionString):\r
+ OptionList = []\r
+ LastChar = " "\r
+ OptionStart = 0\r
+ QuotationMark = ""\r
+ for Index in range(0, len(OptionString)):\r
+ CurrentChar = OptionString[Index]\r
+ if CurrentChar in ['"', "'"]:\r
+ if QuotationMark == CurrentChar:\r
+ QuotationMark = ""\r
+ elif QuotationMark == "":\r
+ QuotationMark = CurrentChar\r
+ continue\r
+ elif QuotationMark:\r
+ continue\r
+\r
+ if CurrentChar in ["/", "-"] and LastChar in [" ", "\t", "\r", "\n"]:\r
+ if Index > OptionStart:\r
+ OptionList.append(OptionString[OptionStart:Index - 1])\r
+ OptionStart = Index\r
+ LastChar = CurrentChar\r
+ OptionList.append(OptionString[OptionStart:])\r
+ return OptionList\r
+\r
+#\r
+# Convert string to C format array\r
+#\r
+def _ConvertStringToByteArray(Value):\r
+ Value = Value.strip()\r
+ if not Value:\r
+ return None\r
+ if Value[0] == '{':\r
+ if not Value.endswith('}'):\r
+ return None\r
+ Value = Value.replace(' ', '').replace('{', '').replace('}', '')\r
+ ValFields = Value.split(',')\r
+ try:\r
+ for Index in range(len(ValFields)):\r
+ ValFields[Index] = str(int(ValFields[Index], 0))\r
+ except ValueError:\r
+ return None\r
+ Value = '{' + ','.join(ValFields) + '}'\r
+ return Value\r
+\r
+ Unicode = False\r
+ if Value.startswith('L"'):\r
+ if not Value.endswith('"'):\r
+ return None\r
+ Value = Value[1:]\r
+ Unicode = True\r
+ elif not Value.startswith('"') or not Value.endswith('"'):\r
+ return None\r
+\r
+ Value = eval(Value) # translate escape character\r
+ NewValue = '{'\r
+ for Index in range(0, len(Value)):\r
+ if Unicode:\r
+ NewValue = NewValue + str(ord(Value[Index]) % 0x10000) + ','\r
+ else:\r
+ NewValue = NewValue + str(ord(Value[Index]) % 0x100) + ','\r
+ Value = NewValue + '0}'\r
+ return Value\r
\r
## Base class for AutoGen\r
#\r
RetVal = cls.__ObjectCache[Key] = super(AutoGen, cls).__new__(cls)\r
return RetVal\r
\r
- def __init__ (self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
- super(AutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
\r
## hash() operator\r
#\r
# call super().__init__ then call the worker function with different parameter count\r
def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
if not hasattr(self, "_Init"):\r
- super(WorkspaceAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
self._Init = True\r
\r
self.FvTargetList = Fvs if Fvs else []\r
self.CapTargetList = Caps if Caps else []\r
self.AutoGenObjectList = []\r
- self._BuildDir = None\r
- self._FvDir = None\r
- self._MakeFileDir = None\r
- self._BuildCommand = None\r
self._GuidDict = {}\r
\r
# there's many relative directory operations, so ...\r
\r
# generate the SourcePcdDict and BinaryPcdDict\r
PGen = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
- for BuildData in PGen.BuildDatabase._CACHE_.values():\r
+ for BuildData in list(PGen.BuildDatabase._CACHE_.values()):\r
if BuildData.Arch != Arch:\r
continue\r
if BuildData.MetaFile.Ext == '.inf':\r
if NewPcd2 not in GlobalData.MixedPcd[item]:\r
GlobalData.MixedPcd[item].append(NewPcd2)\r
\r
- for BuildData in PGen.BuildDatabase._CACHE_.values():\r
+ for BuildData in list(PGen.BuildDatabase._CACHE_.values()):\r
if BuildData.Arch != Arch:\r
continue\r
for key in BuildData.Pcds:\r
'build',\r
PARSER_ERROR,\r
"PCD (%s.%s) used in FDF is not declared in DEC files." % (Guid, Name),\r
- File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],\r
- Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]\r
+ File = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][0],\r
+ Line = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][1]\r
)\r
else:\r
# Check whether Dynamic or DynamicEx PCD used in FDF file. If used, build break and give a error message.\r
'build',\r
PARSER_ERROR,\r
"Using Dynamic or DynamicEx type of PCD [%s.%s] in FDF file is not allowed." % (Guid, Name),\r
- File = self.FdfProfile.PcdFileLineDict[Name, Guid][0],\r
- Line = self.FdfProfile.PcdFileLineDict[Name, Guid][1]\r
+ File = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][0],\r
+ Line = self.FdfProfile.PcdFileLineDict[Name, Guid, Fileds][1]\r
)\r
\r
Pa = PlatformAutoGen(self, self.MetaFile, Target, Toolchain, Arch)\r
#\r
content = 'gCommandLineDefines: '\r
content += str(GlobalData.gCommandLineDefines)\r
- content += os.linesep\r
+ content += TAB_LINE_BREAK\r
content += 'BuildOptionPcd: '\r
content += str(GlobalData.BuildOptionPcd)\r
- content += os.linesep\r
+ content += TAB_LINE_BREAK\r
content += 'Active Platform: '\r
content += str(self.Platform)\r
- content += os.linesep\r
+ content += TAB_LINE_BREAK\r
if self.FdfFile:\r
content += 'Flash Image Definition: '\r
content += str(self.FdfFile)\r
- content += os.linesep\r
+ content += TAB_LINE_BREAK\r
SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), content, False)\r
\r
#\r
if Pa.PcdTokenNumber:\r
if Pa.DynamicPcdList:\r
for Pcd in Pa.DynamicPcdList:\r
- PcdTokenNumber += os.linesep\r
+ PcdTokenNumber += TAB_LINE_BREAK\r
PcdTokenNumber += str((Pcd.TokenCName, Pcd.TokenSpaceGuidCName))\r
PcdTokenNumber += ' : '\r
PcdTokenNumber += str(Pa.PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName])\r
for files in AllWorkSpaceMetaFiles:\r
if files.endswith('.dec'):\r
continue\r
- f = open(files, 'r')\r
+ f = open(files, 'rb')\r
Content = f.read()\r
f.close()\r
m.update(Content)\r
- SaveFileOnChange(os.path.join(self.BuildDir, 'AutoGen.hash'), m.hexdigest(), True)\r
+ SaveFileOnChange(os.path.join(self.BuildDir, 'AutoGen.hash'), m.hexdigest(), False)\r
GlobalData.gPlatformHash = m.hexdigest()\r
\r
#\r
HashFile = os.path.join(PkgDir, Pkg.PackageName + '.hash')\r
m = hashlib.md5()\r
# Get .dec file's hash value\r
- f = open(Pkg.MetaFile.Path, 'r')\r
+ f = open(Pkg.MetaFile.Path, 'rb')\r
Content = f.read()\r
f.close()\r
m.update(Content)\r
for Root, Dirs, Files in os.walk(str(inc)):\r
for File in sorted(Files):\r
File_Path = os.path.join(Root, File)\r
- f = open(File_Path, 'r')\r
+ f = open(File_Path, 'rb')\r
Content = f.read()\r
f.close()\r
m.update(Content)\r
- SaveFileOnChange(HashFile, m.hexdigest(), True)\r
+ SaveFileOnChange(HashFile, m.hexdigest(), False)\r
GlobalData.gPackageHash[Pkg.Arch][Pkg.PackageName] = m.hexdigest()\r
\r
def _GetMetaFiles(self, Target, Toolchain, Arch):\r
return "%s [%s]" % (self.MetaFile, ", ".join(self.ArchList))\r
\r
## Return the directory to store FV files\r
- def _GetFvDir(self):\r
- if self._FvDir is None:\r
- self._FvDir = path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
- return self._FvDir\r
+ @cached_property\r
+ def FvDir(self):\r
+ return path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
\r
## Return the directory to store all intermediate and final files built\r
- def _GetBuildDir(self):\r
- if self._BuildDir is None:\r
- return self.AutoGenObjectList[0].BuildDir\r
+ @cached_property\r
+ def BuildDir(self):\r
+ return self.AutoGenObjectList[0].BuildDir\r
\r
## Return the build output directory platform specifies\r
- def _GetOutputDir(self):\r
+ @cached_property\r
+ def OutputDir(self):\r
return self.Platform.OutputDirectory\r
\r
## Return platform name\r
- def _GetName(self):\r
+ @cached_property\r
+ def Name(self):\r
return self.Platform.PlatformName\r
\r
## Return meta-file GUID\r
- def _GetGuid(self):\r
+ @cached_property\r
+ def Guid(self):\r
return self.Platform.Guid\r
\r
## Return platform version\r
- def _GetVersion(self):\r
+ @cached_property\r
+ def Version(self):\r
return self.Platform.Version\r
\r
## Return paths of tools\r
- def _GetToolDefinition(self):\r
+ @cached_property\r
+ def ToolDefinition(self):\r
return self.AutoGenObjectList[0].ToolDefinition\r
\r
## Return directory of platform makefile\r
#\r
# @retval string Makefile directory\r
#\r
- def _GetMakeFileDir(self):\r
- if self._MakeFileDir is None:\r
- self._MakeFileDir = self.BuildDir\r
- return self._MakeFileDir\r
+ @cached_property\r
+ def MakeFileDir(self):\r
+ return self.BuildDir\r
\r
## Return build command string\r
#\r
# @retval string Build command string\r
#\r
- def _GetBuildCommand(self):\r
- if self._BuildCommand is None:\r
- # BuildCommand should be all the same. So just get one from platform AutoGen\r
- self._BuildCommand = self.AutoGenObjectList[0].BuildCommand\r
- return self._BuildCommand\r
+ @cached_property\r
+ def BuildCommand(self):\r
+ # BuildCommand should be all the same. So just get one from platform AutoGen\r
+ return self.AutoGenObjectList[0].BuildCommand\r
\r
## Check the PCDs token value conflict in each DEC file.\r
#\r
def _CheckAllPcdsTokenValueConflict(self):\r
for Pa in self.AutoGenObjectList:\r
for Package in Pa.PackageList:\r
- PcdList = Package.Pcds.values()\r
- PcdList.sort(lambda x, y: cmp(int(x.TokenValue, 0), int(y.TokenValue, 0)))\r
+ PcdList = list(Package.Pcds.values())\r
+ PcdList.sort(key=lambda x: int(x.TokenValue, 0))\r
Count = 0\r
while (Count < len(PcdList) - 1) :\r
Item = PcdList[Count]\r
#\r
# Sort same token value PCD list with TokenGuid and TokenCName\r
#\r
- SameTokenValuePcdList.sort(lambda x, y: cmp("%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName), "%s.%s" % (y.TokenSpaceGuidCName, y.TokenCName)))\r
+ SameTokenValuePcdList.sort(key=lambda x: "%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName))\r
SameTokenValuePcdListCount = 0\r
while (SameTokenValuePcdListCount < len(SameTokenValuePcdList) - 1):\r
Flag = False\r
Count += SameTokenValuePcdListCount\r
Count += 1\r
\r
- PcdList = Package.Pcds.values()\r
- PcdList.sort(lambda x, y: cmp("%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName), "%s.%s" % (y.TokenSpaceGuidCName, y.TokenCName)))\r
+ PcdList = list(Package.Pcds.values())\r
+ PcdList.sort(key=lambda x: "%s.%s" % (x.TokenSpaceGuidCName, x.TokenCName))\r
Count = 0\r
while (Count < len(PcdList) - 1) :\r
Item = PcdList[Count]\r
)\r
Count += 1\r
## Generate fds command\r
- def _GenFdsCommand(self):\r
+ @property\r
+ def GenFdsCommand(self):\r
return (GenMake.TopLevelMakefile(self)._TEMPLATE_.Replace(GenMake.TopLevelMakefile(self)._TemplateDict)).strip()\r
\r
+ @property\r
+ def GenFdsCommandDict(self):\r
+ FdsCommandDict = {}\r
+ LogLevel = EdkLogger.GetLevel()\r
+ if LogLevel == EdkLogger.VERBOSE:\r
+ FdsCommandDict["verbose"] = True\r
+ elif LogLevel <= EdkLogger.DEBUG_9:\r
+ FdsCommandDict["debug"] = LogLevel - 1\r
+ elif LogLevel == EdkLogger.QUIET:\r
+ FdsCommandDict["quiet"] = True\r
+\r
+ if GlobalData.gEnableGenfdsMultiThread:\r
+ FdsCommandDict["GenfdsMultiThread"] = True\r
+ if GlobalData.gIgnoreSource:\r
+ FdsCommandDict["IgnoreSources"] = True\r
+\r
+ FdsCommandDict["OptionPcd"] = []\r
+ for pcd in GlobalData.BuildOptionPcd:\r
+ if pcd[2]:\r
+ pcdname = '.'.join(pcd[0:3])\r
+ else:\r
+ pcdname = '.'.join(pcd[0:2])\r
+ if pcd[3].startswith('{'):\r
+ FdsCommandDict["OptionPcd"].append(pcdname + '=' + 'H' + '"' + pcd[3] + '"')\r
+ else:\r
+ FdsCommandDict["OptionPcd"].append(pcdname + '=' + pcd[3])\r
+\r
+ MacroList = []\r
+ # macros passed to GenFds\r
+ MacroDict = {}\r
+ MacroDict.update(GlobalData.gGlobalDefines)\r
+ MacroDict.update(GlobalData.gCommandLineDefines)\r
+ for MacroName in MacroDict:\r
+ if MacroDict[MacroName] != "":\r
+ MacroList.append('"%s=%s"' % (MacroName, MacroDict[MacroName].replace('\\', '\\\\')))\r
+ else:\r
+ MacroList.append('"%s"' % MacroName)\r
+ FdsCommandDict["macro"] = MacroList\r
+\r
+ FdsCommandDict["fdf_file"] = [self.FdfFile]\r
+ FdsCommandDict["build_target"] = self.BuildTarget\r
+ FdsCommandDict["toolchain_tag"] = self.ToolChain\r
+ FdsCommandDict["active_platform"] = str(self)\r
+\r
+ FdsCommandDict["conf_directory"] = GlobalData.gConfDirectory\r
+ FdsCommandDict["build_architecture_list"] = ','.join(self.ArchList)\r
+ FdsCommandDict["platform_build_directory"] = self.BuildDir\r
+\r
+ FdsCommandDict["fd"] = self.FdTargetList\r
+ FdsCommandDict["fv"] = self.FvTargetList\r
+ FdsCommandDict["cap"] = self.CapTargetList\r
+ return FdsCommandDict\r
+\r
## Create makefile for the platform and modules in it\r
#\r
# @param CreateDepsMakeFile Flag indicating if the makefile for\r
def CreateAsBuiltInf(self):\r
return\r
\r
- Name = property(_GetName)\r
- Guid = property(_GetGuid)\r
- Version = property(_GetVersion)\r
- OutputDir = property(_GetOutputDir)\r
-\r
- ToolDefinition = property(_GetToolDefinition) # toolcode : tool path\r
-\r
- BuildDir = property(_GetBuildDir)\r
- FvDir = property(_GetFvDir)\r
- MakeFileDir = property(_GetMakeFileDir)\r
- BuildCommand = property(_GetBuildCommand)\r
- GenFdsCommand = property(_GenFdsCommand)\r
\r
## AutoGen class for platform\r
#\r
# call super().__init__ then call the worker function with different parameter count\r
def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
if not hasattr(self, "_Init"):\r
- super(PlatformAutoGen, self).__init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch)\r
self._Init = True\r
#\r
self.SourceOverrideDir = None\r
self.FdTargetList = self.Workspace.FdTargetList\r
self.FvTargetList = self.Workspace.FvTargetList\r
- self.AllPcdList = []\r
# get the original module/package/platform objects\r
self.BuildDatabase = Workspace.BuildDatabase\r
self.DscBuildDataObj = Workspace.Platform\r
- self._GuidDict = Workspace._GuidDict\r
\r
# flag indicating if the makefile/C-code file has been created or not\r
self.IsMakeFileCreated = False\r
- self.IsCodeFileCreated = False\r
-\r
- self._Platform = None\r
- self._Name = None\r
- self._Guid = None\r
- self._Version = None\r
-\r
- self._BuildRule = None\r
- self._SourceDir = None\r
- self._BuildDir = None\r
- self._OutputDir = None\r
- self._FvDir = None\r
- self._MakeFileDir = None\r
- self._FdfFile = None\r
-\r
- self._PcdTokenNumber = None # (TokenCName, TokenSpaceGuidCName) : GeneratedTokenNumber\r
+\r
self._DynamicPcdList = None # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
self._NonDynamicPcdList = None # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
- self._NonDynamicPcdDict = {}\r
-\r
- self._ToolDefinitions = None\r
- self._ToolDefFile = None # toolcode : tool path\r
- self._ToolChainFamily = None\r
- self._BuildRuleFamily = None\r
- self._BuildOption = None # toolcode : option\r
- self._EdkBuildOption = None # edktoolcode : option\r
- self._EdkIIBuildOption = None # edkiitoolcode : option\r
- self._PackageList = None\r
- self._ModuleAutoGenList = None\r
- self._LibraryAutoGenList = None\r
- self._BuildCommand = None\r
+\r
self._AsBuildInfList = []\r
self._AsBuildModuleList = []\r
\r
for Inf in self._AsBuildInfList:\r
InfClass = PathClass(NormPath(Inf), GlobalData.gWorkspace, self.Arch)\r
M = self.BuildDatabase[InfClass, self.Arch, self.BuildTarget, self.ToolChain]\r
- if not M.IsSupportedArch:\r
+ if not M.IsBinaryModule:\r
continue\r
self._AsBuildModuleList.append(InfClass)\r
# get library/modules for build\r
\r
return True\r
\r
+ @cached_class_function\r
def __repr__(self):\r
return "%s [%s]" % (self.MetaFile, self.Arch)\r
\r
# @param CreateModuleCodeFile Flag indicating if creating module's\r
# autogen code file or not\r
#\r
+ @cached_class_function\r
def CreateCodeFile(self, CreateModuleCodeFile=False):\r
- # only module has code to be greated, so do nothing if CreateModuleCodeFile is False\r
- if self.IsCodeFileCreated or not CreateModuleCodeFile:\r
+ # only module has code to be created, so do nothing if CreateModuleCodeFile is False\r
+ if not CreateModuleCodeFile:\r
return\r
\r
for Ma in self.ModuleAutoGenList:\r
Ma.CreateCodeFile(True)\r
\r
- # don't do this twice\r
- self.IsCodeFileCreated = True\r
-\r
## Generate Fds Command\r
- def _GenFdsCommand(self):\r
+ @cached_property\r
+ def GenFdsCommand(self):\r
return self.Workspace.GenFdsCommand\r
\r
- ## Create makefile for the platform and mdoules in it\r
+ ## Create makefile for the platform and modules in it\r
#\r
# @param CreateModuleMakeFile Flag indicating if the makefile for\r
# modules will be created as well\r
#\r
def CreateMakeFile(self, CreateModuleMakeFile=False, FfsCommand = {}):\r
if CreateModuleMakeFile:\r
- for ModuleFile in self.Platform.Modules:\r
- Ma = ModuleAutoGen(self.Workspace, ModuleFile, self.BuildTarget,\r
- self.ToolChain, self.Arch, self.MetaFile)\r
- if (ModuleFile.File, self.Arch) in FfsCommand:\r
- Ma.CreateMakeFile(True, FfsCommand[ModuleFile.File, self.Arch])\r
+ for Ma in self._MaList:\r
+ key = (Ma.MetaFile.File, self.Arch)\r
+ if key in FfsCommand:\r
+ Ma.CreateMakeFile(True, FfsCommand[key])\r
else:\r
Ma.CreateMakeFile(True)\r
- #Ma.CreateAsBuiltInf()\r
\r
# no need to create makefile for the platform more than once\r
if self.IsMakeFileCreated:\r
\r
self.IsMakeFileCreated = True\r
\r
+ @property\r
+ def AllPcdList(self):\r
+ return self.DynamicPcdList + self.NonDynamicPcdList\r
## Deal with Shared FixedAtBuild Pcds\r
#\r
def CollectFixedAtBuildPcds(self):\r
LibAuto.ConstPcd[key] = FixedAtBuildPcds[key]\r
\r
def CollectVariables(self, DynamicPcdSet):\r
-\r
VpdRegionSize = 0\r
VpdRegionBase = 0\r
if self.Workspace.FdfFile:\r
VpdRegionBase = FdRegion.Offset\r
break\r
\r
-\r
- VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(), self.DscBuildDataObj._GetSkuIds())\r
+ VariableInfo = VariableMgr(self.DscBuildDataObj._GetDefaultStores(), self.DscBuildDataObj.SkuIds)\r
VariableInfo.SetVpdRegionMaxSize(VpdRegionSize)\r
VariableInfo.SetVpdRegionOffset(VpdRegionBase)\r
Index = 0\r
if SkuId is None or SkuId == '':\r
continue\r
if len(Sku.VariableName) > 0:\r
+ if Sku.VariableAttribute and 'NV' not in Sku.VariableAttribute:\r
+ continue\r
VariableGuidStructure = Sku.VariableGuidValue\r
VariableGuid = GuidStructureStringToGuidString(VariableGuidStructure)\r
for StorageName in Sku.DefaultStoreDict:\r
- VariableInfo.append_variable(var_info(Index, pcdname, StorageName, SkuName, StringToArray(Sku.VariableName), VariableGuid, Sku.VariableOffset, Sku.VariableAttribute, Sku.HiiDefaultValue, Sku.DefaultStoreDict[StorageName], Pcd.DatumType))\r
+ VariableInfo.append_variable(var_info(Index, pcdname, StorageName, SkuName, StringToArray(Sku.VariableName), VariableGuid, Sku.VariableOffset, Sku.VariableAttribute, Sku.HiiDefaultValue, Sku.DefaultStoreDict[StorageName] if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES else StringToArray(Sku.DefaultStoreDict[StorageName]), Pcd.DatumType, Pcd.CustomAttribute['DscPosition'], Pcd.CustomAttribute.get('IsStru',False)))\r
Index += 1\r
return VariableInfo\r
\r
if os.path.exists(VpdMapFilePath):\r
OrgVpdFile.Read(VpdMapFilePath)\r
PcdItems = OrgVpdFile.GetOffset(PcdNvStoreDfBuffer[0])\r
- NvStoreOffset = PcdItems.values()[0].strip() if PcdItems else '0'\r
+ NvStoreOffset = list(PcdItems.values())[0].strip() if PcdItems else '0'\r
else:\r
EdkLogger.error("build", FILE_READ_FAILURE, "Can not find VPD map file %s to fix up VPD offset." % VpdMapFilePath)\r
\r
# This interface should be invoked explicitly when platform action is created.\r
#\r
def CollectPlatformDynamicPcds(self):\r
-\r
for key in self.Platform.Pcds:\r
for SinglePcd in GlobalData.MixedPcd:\r
if (self.Platform.Pcds[key].TokenCName, self.Platform.Pcds[key].TokenSpaceGuidCName) == SinglePcd:\r
for InfName in self._AsBuildInfList:\r
InfName = mws.join(self.WorkspaceDir, InfName)\r
FdfModuleList.append(os.path.normpath(InfName))\r
- for F in self.Platform.Modules.keys():\r
- M = ModuleAutoGen(self.Workspace, F, self.BuildTarget, self.ToolChain, self.Arch, self.MetaFile)\r
- #GuidValue.update(M.Guids)\r
-\r
- self.Platform.Modules[F].M = M\r
-\r
+ for M in self._MaList:\r
+# F is the Module for which M is the module autogen\r
for PcdFromModule in M.ModulePcdList + M.LibraryPcdList:\r
# make sure that the "VOID*" kind of datum has MaxDatumSize set\r
if PcdFromModule.DatumType == TAB_VOID and not PcdFromModule.MaxDatumSize:\r
- NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, F))\r
+ NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, M.MetaFile))\r
\r
# Check the PCD from Binary INF or Source INF\r
if M.IsBinaryModule == True:\r
PcdFromModule.IsFromDsc = (PcdFromModule.TokenCName, PcdFromModule.TokenSpaceGuidCName) in self.Platform.Pcds\r
\r
if PcdFromModule.Type in PCD_DYNAMIC_TYPE_SET or PcdFromModule.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
- if F.Path not in FdfModuleList:\r
+ if M.MetaFile.Path not in FdfModuleList:\r
# If one of the Source built modules listed in the DSC is not listed\r
# in FDF modules, and the INF lists a PCD can only use the PcdsDynamic\r
# access method (it is only listed in the DEC file that declares the\r
# If a module INF in FDF but not in current arch's DSC module list, it must be module (either binary or source)\r
# for different Arch. PCDs in source module for different Arch is already added before, so skip the source module here.\r
# For binary module, if in current arch, we need to list the PCDs into database.\r
- if not M.IsSupportedArch:\r
+ if not M.IsBinaryModule:\r
continue\r
# Override the module PCD setting by platform setting\r
ModulePcdList = self.ApplyPcdSetting(M, M.Pcds)\r
if (self.Workspace.ArchList[-1] == self.Arch):\r
for Pcd in self._DynamicPcdList:\r
# just pick the a value to determine whether is unicode string type\r
- Sku = Pcd.SkuInfoList.values()[0]\r
+ Sku = Pcd.SkuInfoList.get(TAB_DEFAULT)\r
Sku.VpdOffset = Sku.VpdOffset.strip()\r
\r
if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
self.VariableInfo = self.CollectVariables(self._DynamicPcdList)\r
vardump = self.VariableInfo.dump()\r
if vardump:\r
+ #\r
+ #According to PCD_DATABASE_INIT in edk2\MdeModulePkg\Include\Guid\PcdDataBaseSignatureGuid.h,\r
+ #the max size for string PCD should not exceed USHRT_MAX 65535(0xffff).\r
+ #typedef UINT16 SIZE_INFO;\r
+ #//SIZE_INFO SizeTable[];\r
+ if len(vardump.split(",")) > 0xffff:\r
+ EdkLogger.error("build", RESOURCE_OVERFLOW, 'The current length of PCD %s value is %d, it exceeds to the max size of String PCD.' %(".".join([PcdNvStoreDfBuffer.TokenSpaceGuidCName,PcdNvStoreDfBuffer.TokenCName]) ,len(vardump.split(","))))\r
PcdNvStoreDfBuffer.DefaultValue = vardump\r
for skuname in PcdNvStoreDfBuffer.SkuInfoList:\r
PcdNvStoreDfBuffer.SkuInfoList[skuname].DefaultValue = vardump\r
PcdNvStoreDfBuffer.MaxDatumSize = str(len(vardump.split(",")))\r
-\r
+ else:\r
+ #If the end user define [DefaultStores] and [XXX.Menufacturing] in DSC, but forget to configure PcdNvStoreDefaultValueBuffer to PcdsDynamicVpd\r
+ if [Pcd for Pcd in self._DynamicPcdList if Pcd.UserDefinedDefaultStoresFlag]:\r
+ EdkLogger.warn("build", "PcdNvStoreDefaultValueBuffer should be defined as PcdsDynamicExVpd in dsc file since the DefaultStores is enabled for this platform.\n%s" %self.Platform.MetaFile.Path)\r
PlatformPcds = sorted(self._PlatformPcds.keys())\r
#\r
# Add VPD type PCD into VpdFile and determine whether the VPD PCD need to be fixed up.\r
PcdValue = Sku.DefaultValue\r
if PcdValue == "":\r
PcdValue = Pcd.DefaultValue\r
- if Sku.VpdOffset != '*':\r
+ if Sku.VpdOffset != TAB_STAR:\r
if PcdValue.startswith("{"):\r
Alignment = 8\r
elif PcdValue.startswith("L"):\r
VpdFile.Add(Pcd, SkuName, Sku.VpdOffset)\r
SkuValueMap[PcdValue].append(Sku)\r
# if the offset of a VPD is *, then it need to be fixed up by third party tool.\r
- if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
+ if not NeedProcessVpdMapFile and Sku.VpdOffset == TAB_STAR:\r
NeedProcessVpdMapFile = True\r
if self.Platform.VpdToolGuid is None or self.Platform.VpdToolGuid == '':\r
EdkLogger.error("Build", FILE_NOT_FOUND, \\r
if not FoundFlag :\r
# just pick the a value to determine whether is unicode string type\r
SkuValueMap = {}\r
- SkuObjList = DscPcdEntry.SkuInfoList.items()\r
+ SkuObjList = list(DscPcdEntry.SkuInfoList.items())\r
DefaultSku = DscPcdEntry.SkuInfoList.get(TAB_DEFAULT)\r
if DefaultSku:\r
defaultindex = SkuObjList.index((TAB_DEFAULT, DefaultSku))\r
DscPcdEntry.TokenSpaceGuidValue = eachDec.Guids[DecPcdEntry.TokenSpaceGuidCName]\r
# Only fix the value while no value provided in DSC file.\r
if not Sku.DefaultValue:\r
- DscPcdEntry.SkuInfoList[DscPcdEntry.SkuInfoList.keys()[0]].DefaultValue = DecPcdEntry.DefaultValue\r
+ DscPcdEntry.SkuInfoList[list(DscPcdEntry.SkuInfoList.keys())[0]].DefaultValue = DecPcdEntry.DefaultValue\r
\r
if DscPcdEntry not in self._DynamicPcdList:\r
self._DynamicPcdList.append(DscPcdEntry)\r
PcdValue = Sku.DefaultValue\r
if PcdValue == "":\r
PcdValue = DscPcdEntry.DefaultValue\r
- if Sku.VpdOffset != '*':\r
+ if Sku.VpdOffset != TAB_STAR:\r
if PcdValue.startswith("{"):\r
Alignment = 8\r
elif PcdValue.startswith("L"):\r
SkuValueMap[PcdValue] = []\r
VpdFile.Add(DscPcdEntry, SkuName, Sku.VpdOffset)\r
SkuValueMap[PcdValue].append(Sku)\r
- if not NeedProcessVpdMapFile and Sku.VpdOffset == "*":\r
+ if not NeedProcessVpdMapFile and Sku.VpdOffset == TAB_STAR:\r
NeedProcessVpdMapFile = True\r
if DscPcdEntry.DatumType == TAB_VOID and PcdValue.startswith("L"):\r
UnicodePcdArray.add(DscPcdEntry)\r
self.FixVpdOffset(VpdFile)\r
\r
self.FixVpdOffset(self.UpdateNVStoreMaxSize(VpdFile))\r
+ PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if item.TokenCName == "PcdNvStoreDefaultValueBuffer" and item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]\r
+ if PcdNvStoreDfBuffer:\r
+ PcdName,PcdGuid = PcdNvStoreDfBuffer[0].TokenCName, PcdNvStoreDfBuffer[0].TokenSpaceGuidCName\r
+ if (PcdName,PcdGuid) in VpdSkuMap:\r
+ DefaultSku = PcdNvStoreDfBuffer[0].SkuInfoList.get(TAB_DEFAULT)\r
+ VpdSkuMap[(PcdName,PcdGuid)] = {DefaultSku.DefaultValue:[SkuObj for SkuObj in PcdNvStoreDfBuffer[0].SkuInfoList.values() ]}\r
\r
# Process VPD map file generated by third party BPDG tool\r
if NeedProcessVpdMapFile:\r
if os.path.exists(VpdMapFilePath):\r
VpdFile.Read(VpdMapFilePath)\r
\r
- # Fixup "*" offset\r
+ # Fixup TAB_STAR offset\r
for pcd in VpdSkuMap:\r
vpdinfo = VpdFile.GetVpdInfo(pcd)\r
if vpdinfo is None:\r
# Delete the DynamicPcdList At the last time enter into this function\r
for Pcd in self._DynamicPcdList:\r
# just pick the a value to determine whether is unicode string type\r
- Sku = Pcd.SkuInfoList.values()[0]\r
+ Sku = Pcd.SkuInfoList.get(TAB_DEFAULT)\r
Sku.VpdOffset = Sku.VpdOffset.strip()\r
\r
if Pcd.DatumType not in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, TAB_VOID, "BOOLEAN"]:\r
for pcd in self._DynamicPcdList:\r
if len(pcd.SkuInfoList) == 1:\r
for (SkuName, SkuId) in allskuset:\r
- if type(SkuId) in (str, unicode) and eval(SkuId) == 0 or SkuId == 0:\r
+ if isinstance(SkuId, str) and eval(SkuId) == 0 or SkuId == 0:\r
continue\r
pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList[TAB_DEFAULT])\r
pcd.SkuInfoList[SkuName].SkuId = SkuId\r
- self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList\r
+ pcd.SkuInfoList[SkuName].SkuIdName = SkuName\r
\r
def FixVpdOffset(self, VpdFile ):\r
FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY)\r
EdkLogger.error("Build", FILE_NOT_FOUND, "Fail to find third-party BPDG tool to process VPD PCDs. BPDG Guid tool need to be defined in tools_def.txt and VPD_TOOL_GUID need to be provided in DSC file.")\r
\r
## Return the platform build data object\r
- def _GetPlatform(self):\r
- if self._Platform is None:\r
- self._Platform = self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
- return self._Platform\r
+ @cached_property\r
+ def Platform(self):\r
+ return self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
\r
## Return platform name\r
- def _GetName(self):\r
+ @cached_property\r
+ def Name(self):\r
return self.Platform.PlatformName\r
\r
## Return the meta file GUID\r
- def _GetGuid(self):\r
+ @cached_property\r
+ def Guid(self):\r
return self.Platform.Guid\r
\r
## Return the platform version\r
- def _GetVersion(self):\r
+ @cached_property\r
+ def Version(self):\r
return self.Platform.Version\r
\r
## Return the FDF file name\r
- def _GetFdfFile(self):\r
- if self._FdfFile is None:\r
- if self.Workspace.FdfFile != "":\r
- self._FdfFile= mws.join(self.WorkspaceDir, self.Workspace.FdfFile)\r
- else:\r
- self._FdfFile = ''\r
- return self._FdfFile\r
+ @cached_property\r
+ def FdfFile(self):\r
+ if self.Workspace.FdfFile:\r
+ RetVal= mws.join(self.WorkspaceDir, self.Workspace.FdfFile)\r
+ else:\r
+ RetVal = ''\r
+ return RetVal\r
\r
## Return the build output directory platform specifies\r
- def _GetOutputDir(self):\r
+ @cached_property\r
+ def OutputDir(self):\r
return self.Platform.OutputDirectory\r
\r
## Return the directory to store all intermediate and final files built\r
- def _GetBuildDir(self):\r
- if self._BuildDir is None:\r
- if os.path.isabs(self.OutputDir):\r
- self._BuildDir = path.join(\r
- path.abspath(self.OutputDir),\r
- self.BuildTarget + "_" + self.ToolChain,\r
- )\r
- else:\r
- self._BuildDir = path.join(\r
- self.WorkspaceDir,\r
- self.OutputDir,\r
- self.BuildTarget + "_" + self.ToolChain,\r
- )\r
- GlobalData.gBuildDirectory = self._BuildDir\r
- return self._BuildDir\r
+ @cached_property\r
+ def BuildDir(self):\r
+ if os.path.isabs(self.OutputDir):\r
+ GlobalData.gBuildDirectory = RetVal = path.join(\r
+ path.abspath(self.OutputDir),\r
+ self.BuildTarget + "_" + self.ToolChain,\r
+ )\r
+ else:\r
+ GlobalData.gBuildDirectory = RetVal = path.join(\r
+ self.WorkspaceDir,\r
+ self.OutputDir,\r
+ self.BuildTarget + "_" + self.ToolChain,\r
+ )\r
+ return RetVal\r
\r
## Return directory of platform makefile\r
#\r
# @retval string Makefile directory\r
#\r
- def _GetMakeFileDir(self):\r
- if self._MakeFileDir is None:\r
- self._MakeFileDir = path.join(self.BuildDir, self.Arch)\r
- return self._MakeFileDir\r
+ @cached_property\r
+ def MakeFileDir(self):\r
+ return path.join(self.BuildDir, self.Arch)\r
\r
## Return build command string\r
#\r
# @retval string Build command string\r
#\r
- def _GetBuildCommand(self):\r
- if self._BuildCommand is None:\r
- self._BuildCommand = []\r
- if "MAKE" in self.ToolDefinition and "PATH" in self.ToolDefinition["MAKE"]:\r
- self._BuildCommand += SplitOption(self.ToolDefinition["MAKE"]["PATH"])\r
- if "FLAGS" in self.ToolDefinition["MAKE"]:\r
- NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
- if NewOption != '':\r
- self._BuildCommand += SplitOption(NewOption)\r
- if "MAKE" in self.EdkIIBuildOption:\r
- if "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
- Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
- if Flags.startswith('='):\r
- self._BuildCommand = [self._BuildCommand[0]] + [Flags[1:]]\r
- else:\r
- self._BuildCommand.append(Flags)\r
- return self._BuildCommand\r
+ @cached_property\r
+ def BuildCommand(self):\r
+ RetVal = []\r
+ if "MAKE" in self.ToolDefinition and "PATH" in self.ToolDefinition["MAKE"]:\r
+ RetVal += _SplitOption(self.ToolDefinition["MAKE"]["PATH"])\r
+ if "FLAGS" in self.ToolDefinition["MAKE"]:\r
+ NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip()\r
+ if NewOption != '':\r
+ RetVal += _SplitOption(NewOption)\r
+ if "MAKE" in self.EdkIIBuildOption:\r
+ if "FLAGS" in self.EdkIIBuildOption["MAKE"]:\r
+ Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"]\r
+ if Flags.startswith('='):\r
+ RetVal = [RetVal[0]] + [Flags[1:]]\r
+ else:\r
+ RetVal.append(Flags)\r
+ return RetVal\r
\r
## Get tool chain definition\r
#\r
- # Get each tool defition for given tool chain from tools_def.txt and platform\r
+ # Get each tool definition for given tool chain from tools_def.txt and platform\r
#\r
- def _GetToolDefinition(self):\r
- if self._ToolDefinitions is None:\r
- ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDictionary\r
- if TAB_TOD_DEFINES_COMMAND_TYPE not in self.Workspace.ToolDef.ToolsDefTxtDatabase:\r
- EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "No tools found in configuration",\r
- ExtraData="[%s]" % self.MetaFile)\r
- self._ToolDefinitions = {}\r
- DllPathList = set()\r
- for Def in ToolDefinition:\r
- Target, Tag, Arch, Tool, Attr = Def.split("_")\r
- if Target != self.BuildTarget or Tag != self.ToolChain or Arch != self.Arch:\r
- continue\r
+ @cached_property\r
+ def ToolDefinition(self):\r
+ ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDictionary\r
+ if TAB_TOD_DEFINES_COMMAND_TYPE not in self.Workspace.ToolDef.ToolsDefTxtDatabase:\r
+ EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, "No tools found in configuration",\r
+ ExtraData="[%s]" % self.MetaFile)\r
+ RetVal = {}\r
+ DllPathList = set()\r
+ for Def in ToolDefinition:\r
+ Target, Tag, Arch, Tool, Attr = Def.split("_")\r
+ if Target != self.BuildTarget or Tag != self.ToolChain or Arch != self.Arch:\r
+ continue\r
\r
- Value = ToolDefinition[Def]\r
- # don't record the DLL\r
- if Attr == "DLL":\r
- DllPathList.add(Value)\r
- continue\r
+ Value = ToolDefinition[Def]\r
+ # don't record the DLL\r
+ if Attr == "DLL":\r
+ DllPathList.add(Value)\r
+ continue\r
\r
- if Tool not in self._ToolDefinitions:\r
- self._ToolDefinitions[Tool] = {}\r
- self._ToolDefinitions[Tool][Attr] = Value\r
-\r
- ToolsDef = ''\r
- if GlobalData.gOptions.SilentMode and "MAKE" in self._ToolDefinitions:\r
- if "FLAGS" not in self._ToolDefinitions["MAKE"]:\r
- self._ToolDefinitions["MAKE"]["FLAGS"] = ""\r
- self._ToolDefinitions["MAKE"]["FLAGS"] += " -s"\r
- MakeFlags = ''\r
- for Tool in self._ToolDefinitions:\r
- for Attr in self._ToolDefinitions[Tool]:\r
- Value = self._ToolDefinitions[Tool][Attr]\r
- if Tool in self.BuildOption and Attr in self.BuildOption[Tool]:\r
- # check if override is indicated\r
- if self.BuildOption[Tool][Attr].startswith('='):\r
- Value = self.BuildOption[Tool][Attr][1:]\r
- else:\r
- if Attr != 'PATH':\r
- Value += " " + self.BuildOption[Tool][Attr]\r
- else:\r
- Value = self.BuildOption[Tool][Attr]\r
-\r
- if Attr == "PATH":\r
- # Don't put MAKE definition in the file\r
- if Tool != "MAKE":\r
- ToolsDef += "%s = %s\n" % (Tool, Value)\r
- elif Attr != "DLL":\r
- # Don't put MAKE definition in the file\r
- if Tool == "MAKE":\r
- if Attr == "FLAGS":\r
- MakeFlags = Value\r
+ if Tool not in RetVal:\r
+ RetVal[Tool] = {}\r
+ RetVal[Tool][Attr] = Value\r
+\r
+ ToolsDef = ''\r
+ if GlobalData.gOptions.SilentMode and "MAKE" in RetVal:\r
+ if "FLAGS" not in RetVal["MAKE"]:\r
+ RetVal["MAKE"]["FLAGS"] = ""\r
+ RetVal["MAKE"]["FLAGS"] += " -s"\r
+ MakeFlags = ''\r
+ for Tool in RetVal:\r
+ for Attr in RetVal[Tool]:\r
+ Value = RetVal[Tool][Attr]\r
+ if Tool in self._BuildOptionWithToolDef(RetVal) and Attr in self._BuildOptionWithToolDef(RetVal)[Tool]:\r
+ # check if override is indicated\r
+ if self._BuildOptionWithToolDef(RetVal)[Tool][Attr].startswith('='):\r
+ Value = self._BuildOptionWithToolDef(RetVal)[Tool][Attr][1:]\r
+ else:\r
+ if Attr != 'PATH':\r
+ Value += " " + self._BuildOptionWithToolDef(RetVal)[Tool][Attr]\r
else:\r
- ToolsDef += "%s_%s = %s\n" % (Tool, Attr, Value)\r
- ToolsDef += "\n"\r
+ Value = self._BuildOptionWithToolDef(RetVal)[Tool][Attr]\r
+\r
+ if Attr == "PATH":\r
+ # Don't put MAKE definition in the file\r
+ if Tool != "MAKE":\r
+ ToolsDef += "%s = %s\n" % (Tool, Value)\r
+ elif Attr != "DLL":\r
+ # Don't put MAKE definition in the file\r
+ if Tool == "MAKE":\r
+ if Attr == "FLAGS":\r
+ MakeFlags = Value\r
+ else:\r
+ ToolsDef += "%s_%s = %s\n" % (Tool, Attr, Value)\r
+ ToolsDef += "\n"\r
\r
- SaveFileOnChange(self.ToolDefinitionFile, ToolsDef)\r
- for DllPath in DllPathList:\r
- os.environ["PATH"] = DllPath + os.pathsep + os.environ["PATH"]\r
- os.environ["MAKE_FLAGS"] = MakeFlags\r
+ SaveFileOnChange(self.ToolDefinitionFile, ToolsDef, False)\r
+ for DllPath in DllPathList:\r
+ os.environ["PATH"] = DllPath + os.pathsep + os.environ["PATH"]\r
+ os.environ["MAKE_FLAGS"] = MakeFlags\r
\r
- return self._ToolDefinitions\r
+ return RetVal\r
\r
## Return the paths of tools\r
- def _GetToolDefFile(self):\r
- if self._ToolDefFile is None:\r
- self._ToolDefFile = os.path.join(self.MakeFileDir, "TOOLS_DEF." + self.Arch)\r
- return self._ToolDefFile\r
+ @cached_property\r
+ def ToolDefinitionFile(self):\r
+ return os.path.join(self.MakeFileDir, "TOOLS_DEF." + self.Arch)\r
\r
## Retrieve the toolchain family of given toolchain tag. Default to 'MSFT'.\r
- def _GetToolChainFamily(self):\r
- if self._ToolChainFamily is None:\r
- ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDatabase\r
- if TAB_TOD_DEFINES_FAMILY not in ToolDefinition \\r
- or self.ToolChain not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
- or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][self.ToolChain]:\r
- EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
- % self.ToolChain)\r
- self._ToolChainFamily = "MSFT"\r
- else:\r
- self._ToolChainFamily = ToolDefinition[TAB_TOD_DEFINES_FAMILY][self.ToolChain]\r
- return self._ToolChainFamily\r
-\r
- def _GetBuildRuleFamily(self):\r
- if self._BuildRuleFamily is None:\r
- ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDatabase\r
- if TAB_TOD_DEFINES_BUILDRULEFAMILY not in ToolDefinition \\r
- or self.ToolChain not in ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY] \\r
- or not ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]:\r
- EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
- % self.ToolChain)\r
- self._BuildRuleFamily = "MSFT"\r
- else:\r
- self._BuildRuleFamily = ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]\r
- return self._BuildRuleFamily\r
+ @cached_property\r
+ def ToolChainFamily(self):\r
+ ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDatabase\r
+ if TAB_TOD_DEFINES_FAMILY not in ToolDefinition \\r
+ or self.ToolChain not in ToolDefinition[TAB_TOD_DEFINES_FAMILY] \\r
+ or not ToolDefinition[TAB_TOD_DEFINES_FAMILY][self.ToolChain]:\r
+ EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
+ % self.ToolChain)\r
+ RetVal = TAB_COMPILER_MSFT\r
+ else:\r
+ RetVal = ToolDefinition[TAB_TOD_DEFINES_FAMILY][self.ToolChain]\r
+ return RetVal\r
+\r
+ @cached_property\r
+ def BuildRuleFamily(self):\r
+ ToolDefinition = self.Workspace.ToolDef.ToolsDefTxtDatabase\r
+ if TAB_TOD_DEFINES_BUILDRULEFAMILY not in ToolDefinition \\r
+ or self.ToolChain not in ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY] \\r
+ or not ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]:\r
+ EdkLogger.verbose("No tool chain family found in configuration for %s. Default to MSFT." \\r
+ % self.ToolChain)\r
+ return TAB_COMPILER_MSFT\r
+\r
+ return ToolDefinition[TAB_TOD_DEFINES_BUILDRULEFAMILY][self.ToolChain]\r
\r
## Return the build options specific for all modules in this platform\r
- def _GetBuildOptions(self):\r
- if self._BuildOption is None:\r
- self._BuildOption = self._ExpandBuildOption(self.Platform.BuildOptions)\r
- return self._BuildOption\r
+ @cached_property\r
+ def BuildOption(self):\r
+ return self._ExpandBuildOption(self.Platform.BuildOptions)\r
+\r
+ def _BuildOptionWithToolDef(self, ToolDef):\r
+ return self._ExpandBuildOption(self.Platform.BuildOptions, ToolDef=ToolDef)\r
\r
## Return the build options specific for EDK modules in this platform\r
- def _GetEdkBuildOptions(self):\r
- if self._EdkBuildOption is None:\r
- self._EdkBuildOption = self._ExpandBuildOption(self.Platform.BuildOptions, EDK_NAME)\r
- return self._EdkBuildOption\r
+ @cached_property\r
+ def EdkBuildOption(self):\r
+ return self._ExpandBuildOption(self.Platform.BuildOptions, EDK_NAME)\r
\r
## Return the build options specific for EDKII modules in this platform\r
- def _GetEdkIIBuildOptions(self):\r
- if self._EdkIIBuildOption is None:\r
- self._EdkIIBuildOption = self._ExpandBuildOption(self.Platform.BuildOptions, EDKII_NAME)\r
- return self._EdkIIBuildOption\r
+ @cached_property\r
+ def EdkIIBuildOption(self):\r
+ return self._ExpandBuildOption(self.Platform.BuildOptions, EDKII_NAME)\r
\r
## Parse build_rule.txt in Conf Directory.\r
#\r
# @retval BuildRule object\r
#\r
- def _GetBuildRule(self):\r
- if self._BuildRule is None:\r
- BuildRuleFile = None\r
- if TAB_TAT_DEFINES_BUILD_RULE_CONF in self.Workspace.TargetTxt.TargetTxtDictionary:\r
- BuildRuleFile = self.Workspace.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_BUILD_RULE_CONF]\r
- if not BuildRuleFile:\r
- BuildRuleFile = gDefaultBuildRuleFile\r
- self._BuildRule = BuildRule(BuildRuleFile)\r
- if self._BuildRule._FileVersion == "":\r
- self._BuildRule._FileVersion = AutoGenReqBuildRuleVerNum\r
- else:\r
- if self._BuildRule._FileVersion < AutoGenReqBuildRuleVerNum :\r
- # If Build Rule's version is less than the version number required by the tools, halting the build.\r
- EdkLogger.error("build", AUTOGEN_ERROR,\r
- ExtraData="The version number [%s] of build_rule.txt is less than the version number required by the AutoGen.(the minimum required version number is [%s])"\\r
- % (self._BuildRule._FileVersion, AutoGenReqBuildRuleVerNum))\r
-\r
- return self._BuildRule\r
+ @cached_property\r
+ def BuildRule(self):\r
+ BuildRuleFile = None\r
+ if TAB_TAT_DEFINES_BUILD_RULE_CONF in self.Workspace.TargetTxt.TargetTxtDictionary:\r
+ BuildRuleFile = self.Workspace.TargetTxt.TargetTxtDictionary[TAB_TAT_DEFINES_BUILD_RULE_CONF]\r
+ if not BuildRuleFile:\r
+ BuildRuleFile = gDefaultBuildRuleFile\r
+ RetVal = BuildRule(BuildRuleFile)\r
+ if RetVal._FileVersion == "":\r
+ RetVal._FileVersion = AutoGenReqBuildRuleVerNum\r
+ else:\r
+ if RetVal._FileVersion < AutoGenReqBuildRuleVerNum :\r
+ # If Build Rule's version is less than the version number required by the tools, halting the build.\r
+ EdkLogger.error("build", AUTOGEN_ERROR,\r
+ ExtraData="The version number [%s] of build_rule.txt is less than the version number required by the AutoGen.(the minimum required version number is [%s])"\\r
+ % (RetVal._FileVersion, AutoGenReqBuildRuleVerNum))\r
+ return RetVal\r
\r
## Summarize the packages used by modules in this platform\r
- def _GetPackageList(self):\r
- if self._PackageList is None:\r
- self._PackageList = set()\r
- for La in self.LibraryAutoGenList:\r
- self._PackageList.update(La.DependentPackageList)\r
- for Ma in self.ModuleAutoGenList:\r
- self._PackageList.update(Ma.DependentPackageList)\r
- #Collect package set information from INF of FDF\r
- PkgSet = set()\r
- for ModuleFile in self._AsBuildModuleList:\r
- if ModuleFile in self.Platform.Modules:\r
- continue\r
- ModuleData = self.BuildDatabase[ModuleFile, self.Arch, self.BuildTarget, self.ToolChain]\r
- PkgSet.update(ModuleData.Packages)\r
- self._PackageList = list(self._PackageList) + list (PkgSet)\r
- return self._PackageList\r
+ @cached_property\r
+ def PackageList(self):\r
+ RetVal = set()\r
+ for La in self.LibraryAutoGenList:\r
+ RetVal.update(La.DependentPackageList)\r
+ for Ma in self.ModuleAutoGenList:\r
+ RetVal.update(Ma.DependentPackageList)\r
+ #Collect package set information from INF of FDF\r
+ for ModuleFile in self._AsBuildModuleList:\r
+ if ModuleFile in self.Platform.Modules:\r
+ continue\r
+ ModuleData = self.BuildDatabase[ModuleFile, self.Arch, self.BuildTarget, self.ToolChain]\r
+ RetVal.update(ModuleData.Packages)\r
+ return list(RetVal)\r
\r
- def _GetNonDynamicPcdDict(self):\r
- if self._NonDynamicPcdDict:\r
- return self._NonDynamicPcdDict\r
- for Pcd in self.NonDynamicPcdList:\r
- self._NonDynamicPcdDict[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName)] = Pcd\r
- return self._NonDynamicPcdDict\r
+ @cached_property\r
+ def NonDynamicPcdDict(self):\r
+ return {(Pcd.TokenCName, Pcd.TokenSpaceGuidCName):Pcd for Pcd in self.NonDynamicPcdList}\r
\r
## Get list of non-dynamic PCDs\r
- def _GetNonDynamicPcdList(self):\r
- if self._NonDynamicPcdList is None:\r
+ @property\r
+ def NonDynamicPcdList(self):\r
+ if not self._NonDynamicPcdList:\r
self.CollectPlatformDynamicPcds()\r
return self._NonDynamicPcdList\r
\r
## Get list of dynamic PCDs\r
- def _GetDynamicPcdList(self):\r
- if self._DynamicPcdList is None:\r
+ @property\r
+ def DynamicPcdList(self):\r
+ if not self._DynamicPcdList:\r
self.CollectPlatformDynamicPcds()\r
return self._DynamicPcdList\r
\r
## Generate Token Number for all PCD\r
- def _GetPcdTokenNumbers(self):\r
- if self._PcdTokenNumber is None:\r
- self._PcdTokenNumber = OrderedDict()\r
- TokenNumber = 1\r
- #\r
- # Make the Dynamic and DynamicEx PCD use within different TokenNumber area.\r
- # Such as:\r
- #\r
- # Dynamic PCD:\r
- # TokenNumber 0 ~ 10\r
- # DynamicEx PCD:\r
- # TokeNumber 11 ~ 20\r
- #\r
- for Pcd in self.DynamicPcdList:\r
- if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
- EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
- self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
- TokenNumber += 1\r
-\r
- for Pcd in self.DynamicPcdList:\r
- if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
- EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
- self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
- TokenNumber += 1\r
-\r
- for Pcd in self.DynamicPcdList:\r
- if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
- EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
- self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
- TokenNumber += 1\r
-\r
- for Pcd in self.DynamicPcdList:\r
- if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
- EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
- self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
- TokenNumber += 1\r
-\r
- for Pcd in self.NonDynamicPcdList:\r
- self._PcdTokenNumber[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+ @cached_property\r
+ def PcdTokenNumber(self):\r
+ RetVal = OrderedDict()\r
+ TokenNumber = 1\r
+ #\r
+ # Make the Dynamic and DynamicEx PCD use within different TokenNumber area.\r
+ # Such as:\r
+ #\r
+ # Dynamic PCD:\r
+ # TokenNumber 0 ~ 10\r
+ # DynamicEx PCD:\r
+ # TokeNumber 11 ~ 20\r
+ #\r
+ for Pcd in self.DynamicPcdList:\r
+ if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
+ EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+ RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+ TokenNumber += 1\r
+\r
+ for Pcd in self.DynamicPcdList:\r
+ if Pcd.Phase == "PEI" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
+ EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+ RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+ TokenNumber += 1\r
+\r
+ for Pcd in self.DynamicPcdList:\r
+ if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
+ EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+ RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+ TokenNumber += 1\r
+\r
+ for Pcd in self.DynamicPcdList:\r
+ if Pcd.Phase == "DXE" and Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
+ EdkLogger.debug(EdkLogger.DEBUG_5, "%s %s (%s) -> %d" % (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Pcd.Phase, TokenNumber))\r
+ RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
TokenNumber += 1\r
- return self._PcdTokenNumber\r
\r
- ## Summarize ModuleAutoGen objects of all modules/libraries to be built for this platform\r
- def _GetAutoGenObjectList(self):\r
- self._ModuleAutoGenList = []\r
- self._LibraryAutoGenList = []\r
+ for Pcd in self.NonDynamicPcdList:\r
+ RetVal[Pcd.TokenCName, Pcd.TokenSpaceGuidCName] = TokenNumber\r
+ TokenNumber += 1\r
+ return RetVal\r
+\r
+ @cached_property\r
+ def _MaList(self):\r
for ModuleFile in self.Platform.Modules:\r
Ma = ModuleAutoGen(\r
- self.Workspace,\r
- ModuleFile,\r
- self.BuildTarget,\r
- self.ToolChain,\r
- self.Arch,\r
- self.MetaFile\r
- )\r
- if Ma not in self._ModuleAutoGenList:\r
- self._ModuleAutoGenList.append(Ma)\r
- for La in Ma.LibraryAutoGenList:\r
- if La not in self._LibraryAutoGenList:\r
- self._LibraryAutoGenList.append(La)\r
- if Ma not in La.ReferenceModules:\r
- La.ReferenceModules.append(Ma)\r
+ self.Workspace,\r
+ ModuleFile,\r
+ self.BuildTarget,\r
+ self.ToolChain,\r
+ self.Arch,\r
+ self.MetaFile\r
+ )\r
+ self.Platform.Modules[ModuleFile].M = Ma\r
+ return [x.M for x in self.Platform.Modules.values()]\r
\r
## Summarize ModuleAutoGen objects of all modules to be built for this platform\r
- def _GetModuleAutoGenList(self):\r
- if self._ModuleAutoGenList is None:\r
- self._GetAutoGenObjectList()\r
- return self._ModuleAutoGenList\r
+ @cached_property\r
+ def ModuleAutoGenList(self):\r
+ RetVal = []\r
+ for Ma in self._MaList:\r
+ if Ma not in RetVal:\r
+ RetVal.append(Ma)\r
+ return RetVal\r
\r
## Summarize ModuleAutoGen objects of all libraries to be built for this platform\r
- def _GetLibraryAutoGenList(self):\r
- if self._LibraryAutoGenList is None:\r
- self._GetAutoGenObjectList()\r
- return self._LibraryAutoGenList\r
+ @cached_property\r
+ def LibraryAutoGenList(self):\r
+ RetVal = []\r
+ for Ma in self._MaList:\r
+ for La in Ma.LibraryAutoGenList:\r
+ if La not in RetVal:\r
+ RetVal.append(La)\r
+ if Ma not in La.ReferenceModules:\r
+ La.ReferenceModules.append(Ma)\r
+ return RetVal\r
\r
## Test if a module is supported by the platform\r
#\r
\r
## Override PCD setting (type, value, ...)\r
#\r
- # @param ToPcd The PCD to be overrided\r
- # @param FromPcd The PCD overrideing from\r
+ # @param ToPcd The PCD to be overridden\r
+ # @param FromPcd The PCD overriding from\r
#\r
def _OverridePcd(self, ToPcd, FromPcd, Module="", Msg="", Library=""):\r
#\r
ToPcd.DatumType = FromPcd.DatumType\r
if FromPcd.SkuInfoList:\r
ToPcd.SkuInfoList = FromPcd.SkuInfoList\r
+ if FromPcd.UserDefinedDefaultStoresFlag:\r
+ ToPcd.UserDefinedDefaultStoresFlag = FromPcd.UserDefinedDefaultStoresFlag\r
# Add Flexible PCD format parse\r
if ToPcd.DefaultValue:\r
try:\r
- ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, self._GuidDict)(True)\r
+ ToPcd.DefaultValue = ValueExpressionEx(ToPcd.DefaultValue, ToPcd.DatumType, self.Workspace._GuidDict)(True)\r
except BadExpression as Value:\r
EdkLogger.error('Parser', FORMAT_INVALID, 'PCD [%s.%s] Value "%s", %s' %(ToPcd.TokenSpaceGuidCName, ToPcd.TokenCName, ToPcd.DefaultValue, Value),\r
File=self.MetaFile)\r
ToPcd.validateranges = FromPcd.validateranges\r
ToPcd.validlists = FromPcd.validlists\r
ToPcd.expressions = FromPcd.expressions\r
+ ToPcd.CustomAttribute = FromPcd.CustomAttribute\r
\r
if FromPcd is not None and ToPcd.DatumType == TAB_VOID and not ToPcd.MaxDatumSize:\r
EdkLogger.debug(EdkLogger.DEBUG_9, "No MaxDatumSize specified for PCD %s.%s" \\r
\r
## Apply PCD setting defined platform to a module\r
#\r
- # @param Module The module from which the PCD setting will be overrided\r
+ # @param Module The module from which the PCD setting will be overridden\r
#\r
# @retval PCD_list The list PCDs with settings from platform\r
#\r
if Module in self.Platform.Modules:\r
PlatformModule = self.Platform.Modules[str(Module)]\r
for Key in PlatformModule.Pcds:\r
+ if GlobalData.BuildOptionPcd:\r
+ for pcd in GlobalData.BuildOptionPcd:\r
+ (TokenSpaceGuidCName, TokenCName, FieldName, pcdvalue, _) = pcd\r
+ if (TokenCName, TokenSpaceGuidCName) == Key and FieldName =="":\r
+ PlatformModule.Pcds[Key].DefaultValue = pcdvalue\r
+ PlatformModule.Pcds[Key].PcdValueFromComm = pcdvalue\r
+ break\r
Flag = False\r
if Key in Pcds:\r
ToPcd = Pcds[Key]\r
Pcd.MaxDatumSize = str(len(Value.split(',')))\r
else:\r
Pcd.MaxDatumSize = str(len(Value) - 1)\r
- return Pcds.values()\r
+ return list(Pcds.values())\r
\r
- ## Resolve library names to library modules\r
- #\r
- # (for Edk.x modules)\r
- #\r
- # @param Module The module from which the library names will be resolved\r
- #\r
- # @retval library_list The list of library modules\r
- #\r
- def ResolveLibraryReference(self, Module):\r
- EdkLogger.verbose("")\r
- EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), self.Arch))\r
- LibraryConsumerList = [Module]\r
-\r
- # "CompilerStub" is a must for Edk modules\r
- if Module.Libraries:\r
- Module.Libraries.append("CompilerStub")\r
- LibraryList = []\r
- while len(LibraryConsumerList) > 0:\r
- M = LibraryConsumerList.pop()\r
- for LibraryName in M.Libraries:\r
- Library = self.Platform.LibraryClasses[LibraryName, ':dummy:']\r
- if Library is None:\r
- for Key in self.Platform.LibraryClasses.data:\r
- if LibraryName.upper() == Key.upper():\r
- Library = self.Platform.LibraryClasses[Key, ':dummy:']\r
- break\r
- if Library is None:\r
- EdkLogger.warn("build", "Library [%s] is not found" % LibraryName, File=str(M),\r
- ExtraData="\t%s [%s]" % (str(Module), self.Arch))\r
- continue\r
\r
- if Library not in LibraryList:\r
- LibraryList.append(Library)\r
- LibraryConsumerList.append(Library)\r
- EdkLogger.verbose("\t" + LibraryName + " : " + str(Library) + ' ' + str(type(Library)))\r
- return LibraryList\r
\r
## Calculate the priority value of the build option\r
#\r
def CalculatePriorityValue(self, Key):\r
Target, ToolChain, Arch, CommandType, Attr = Key.split('_')\r
PriorityValue = 0x11111\r
- if Target == "*":\r
+ if Target == TAB_STAR:\r
PriorityValue &= 0x01111\r
- if ToolChain == "*":\r
+ if ToolChain == TAB_STAR:\r
PriorityValue &= 0x10111\r
- if Arch == "*":\r
+ if Arch == TAB_STAR:\r
PriorityValue &= 0x11011\r
- if CommandType == "*":\r
+ if CommandType == TAB_STAR:\r
PriorityValue &= 0x11101\r
- if Attr == "*":\r
+ if Attr == TAB_STAR:\r
PriorityValue &= 0x11110\r
\r
return self.PrioList["0x%0.5x" % PriorityValue]\r
## Expand * in build option key\r
#\r
# @param Options Options to be expanded\r
+ # @param ToolDef Use specified ToolDef instead of full version.\r
+ # This is needed during initialization to prevent\r
+ # infinite recursion betweeh BuildOptions,\r
+ # ToolDefinition, and this function.\r
#\r
# @retval options Options expanded\r
#\r
- def _ExpandBuildOption(self, Options, ModuleStyle=None):\r
+ def _ExpandBuildOption(self, Options, ModuleStyle=None, ToolDef=None):\r
+ if not ToolDef:\r
+ ToolDef = self.ToolDefinition\r
BuildOptions = {}\r
FamilyMatch = False\r
FamilyIsNull = True\r
if (Key[0] == self.BuildRuleFamily and\r
(ModuleStyle is None or len(Key) < 3 or (len(Key) > 2 and Key[2] == ModuleStyle))):\r
Target, ToolChain, Arch, CommandType, Attr = Key[1].split('_')\r
- if (Target == self.BuildTarget or Target == "*") and\\r
- (ToolChain == self.ToolChain or ToolChain == "*") and\\r
- (Arch == self.Arch or Arch == "*") and\\r
+ if (Target == self.BuildTarget or Target == TAB_STAR) and\\r
+ (ToolChain == self.ToolChain or ToolChain == TAB_STAR) and\\r
+ (Arch == self.Arch or Arch == TAB_STAR) and\\r
Options[Key].startswith("="):\r
\r
if OverrideList.get(Key[1]) is not None:\r
# Use the highest priority value.\r
#\r
if (len(OverrideList) >= 2):\r
- KeyList = OverrideList.keys()\r
+ KeyList = list(OverrideList.keys())\r
for Index in range(len(KeyList)):\r
NowKey = KeyList[Index]\r
Target1, ToolChain1, Arch1, CommandType1, Attr1 = NowKey.split("_")\r
# Compare two Key, if one is included by another, choose the higher priority one\r
#\r
Target2, ToolChain2, Arch2, CommandType2, Attr2 = NextKey.split("_")\r
- if (Target1 == Target2 or Target1 == "*" or Target2 == "*") and\\r
- (ToolChain1 == ToolChain2 or ToolChain1 == "*" or ToolChain2 == "*") and\\r
- (Arch1 == Arch2 or Arch1 == "*" or Arch2 == "*") and\\r
- (CommandType1 == CommandType2 or CommandType1 == "*" or CommandType2 == "*") and\\r
- (Attr1 == Attr2 or Attr1 == "*" or Attr2 == "*"):\r
+ if (Target1 == Target2 or Target1 == TAB_STAR or Target2 == TAB_STAR) and\\r
+ (ToolChain1 == ToolChain2 or ToolChain1 == TAB_STAR or ToolChain2 == TAB_STAR) and\\r
+ (Arch1 == Arch2 or Arch1 == TAB_STAR or Arch2 == TAB_STAR) and\\r
+ (CommandType1 == CommandType2 or CommandType1 == TAB_STAR or CommandType2 == TAB_STAR) and\\r
+ (Attr1 == Attr2 or Attr1 == TAB_STAR or Attr2 == TAB_STAR):\r
\r
if self.CalculatePriorityValue(NowKey) > self.CalculatePriorityValue(NextKey):\r
if Options.get((self.BuildRuleFamily, NextKey)) is not None:\r
Family = Key[0]\r
Target, Tag, Arch, Tool, Attr = Key[1].split("_")\r
# if tool chain family doesn't match, skip it\r
- if Tool in self.ToolDefinition and Family != "":\r
+ if Tool in ToolDef and Family != "":\r
FamilyIsNull = False\r
- if self.ToolDefinition[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "":\r
- if Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]:\r
+ if ToolDef[Tool].get(TAB_TOD_DEFINES_BUILDRULEFAMILY, "") != "":\r
+ if Family != ToolDef[Tool][TAB_TOD_DEFINES_BUILDRULEFAMILY]:\r
continue\r
- elif Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_FAMILY]:\r
+ elif Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:\r
continue\r
FamilyMatch = True\r
# expand any wildcard\r
- if Target == "*" or Target == self.BuildTarget:\r
- if Tag == "*" or Tag == self.ToolChain:\r
- if Arch == "*" or Arch == self.Arch:\r
+ if Target == TAB_STAR or Target == self.BuildTarget:\r
+ if Tag == TAB_STAR or Tag == self.ToolChain:\r
+ if Arch == TAB_STAR or Arch == self.Arch:\r
if Tool not in BuildOptions:\r
BuildOptions[Tool] = {}\r
if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or Options[Key].startswith('='):\r
Family = Key[0]\r
Target, Tag, Arch, Tool, Attr = Key[1].split("_")\r
# if tool chain family doesn't match, skip it\r
- if Tool not in self.ToolDefinition or Family == "":\r
+ if Tool not in ToolDef or Family == "":\r
continue\r
# option has been added before\r
- if Family != self.ToolDefinition[Tool][TAB_TOD_DEFINES_FAMILY]:\r
+ if Family != ToolDef[Tool][TAB_TOD_DEFINES_FAMILY]:\r
continue\r
\r
# expand any wildcard\r
- if Target == "*" or Target == self.BuildTarget:\r
- if Tag == "*" or Tag == self.ToolChain:\r
- if Arch == "*" or Arch == self.Arch:\r
+ if Target == TAB_STAR or Target == self.BuildTarget:\r
+ if Tag == TAB_STAR or Tag == self.ToolChain:\r
+ if Arch == TAB_STAR or Arch == self.Arch:\r
if Tool not in BuildOptions:\r
BuildOptions[Tool] = {}\r
if Attr != "FLAGS" or Attr not in BuildOptions[Tool] or Options[Key].startswith('='):\r
\r
## Append build options in platform to a module\r
#\r
- # @param Module The module to which the build options will be appened\r
+ # @param Module The module to which the build options will be appended\r
#\r
# @retval options The options appended with build options in platform\r
#\r
def ApplyBuildOption(self, Module):\r
# Get the different options for the different style module\r
- if Module.AutoGenVersion < 0x00010005:\r
- PlatformOptions = self.EdkBuildOption\r
- ModuleTypeOptions = self.Platform.GetBuildOptionsByModuleType(EDK_NAME, Module.ModuleType)\r
- else:\r
- PlatformOptions = self.EdkIIBuildOption\r
- ModuleTypeOptions = self.Platform.GetBuildOptionsByModuleType(EDKII_NAME, Module.ModuleType)\r
+ PlatformOptions = self.EdkIIBuildOption\r
+ ModuleTypeOptions = self.Platform.GetBuildOptionsByModuleType(EDKII_NAME, Module.ModuleType)\r
ModuleTypeOptions = self._ExpandBuildOption(ModuleTypeOptions)\r
ModuleOptions = self._ExpandBuildOption(Module.BuildOptions)\r
if Module in self.Platform.Modules:\r
if Attr == TAB_TOD_DEFINES_BUILDRULEORDER:\r
BuildRuleOrder = Options[Tool][Attr]\r
\r
- AllTools = set(ModuleOptions.keys() + PlatformOptions.keys() +\r
- PlatformModuleOptions.keys() + ModuleTypeOptions.keys() +\r
- self.ToolDefinition.keys())\r
+ AllTools = set(list(ModuleOptions.keys()) + list(PlatformOptions.keys()) +\r
+ list(PlatformModuleOptions.keys()) + list(ModuleTypeOptions.keys()) +\r
+ list(self.ToolDefinition.keys()))\r
BuildOptions = defaultdict(lambda: defaultdict(str))\r
for Tool in AllTools:\r
for Options in [self.ToolDefinition, ModuleOptions, PlatformOptions, ModuleTypeOptions, PlatformModuleOptions]:\r
else:\r
BuildOptions[Tool][Attr] = mws.handleWsMacro(Value)\r
\r
- if Module.AutoGenVersion < 0x00010005 and self.Workspace.UniFlag is not None:\r
- #\r
- # Override UNI flag only for EDK module.\r
- #\r
- BuildOptions['BUILD']['FLAGS'] = self.Workspace.UniFlag\r
return BuildOptions, BuildRuleOrder\r
\r
- Platform = property(_GetPlatform)\r
- Name = property(_GetName)\r
- Guid = property(_GetGuid)\r
- Version = property(_GetVersion)\r
-\r
- OutputDir = property(_GetOutputDir)\r
- BuildDir = property(_GetBuildDir)\r
- MakeFileDir = property(_GetMakeFileDir)\r
- FdfFile = property(_GetFdfFile)\r
-\r
- PcdTokenNumber = property(_GetPcdTokenNumbers) # (TokenCName, TokenSpaceGuidCName) : GeneratedTokenNumber\r
- DynamicPcdList = property(_GetDynamicPcdList) # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
- NonDynamicPcdList = property(_GetNonDynamicPcdList) # [(TokenCName1, TokenSpaceGuidCName1), (TokenCName2, TokenSpaceGuidCName2), ...]\r
- NonDynamicPcdDict = property(_GetNonDynamicPcdDict)\r
- PackageList = property(_GetPackageList)\r
-\r
- ToolDefinition = property(_GetToolDefinition) # toolcode : tool path\r
- ToolDefinitionFile = property(_GetToolDefFile) # toolcode : lib path\r
- ToolChainFamily = property(_GetToolChainFamily)\r
- BuildRuleFamily = property(_GetBuildRuleFamily)\r
- BuildOption = property(_GetBuildOptions) # toolcode : option\r
- EdkBuildOption = property(_GetEdkBuildOptions) # edktoolcode : option\r
- EdkIIBuildOption = property(_GetEdkIIBuildOptions) # edkiitoolcode : option\r
-\r
- BuildCommand = property(_GetBuildCommand)\r
- BuildRule = property(_GetBuildRule)\r
- ModuleAutoGenList = property(_GetModuleAutoGenList)\r
- LibraryAutoGenList = property(_GetLibraryAutoGenList)\r
- GenFdsCommand = property(_GenFdsCommand)\r
-\r
#\r
# extend lists contained in a dictionary with lists stored in another dictionary\r
# if CopyToDict is not derived from DefaultDict(list) then this may raise exception\r
# call super().__init__ then call the worker function with different parameter count\r
def __init__(self, Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs):\r
if not hasattr(self, "_Init"):\r
- super(ModuleAutoGen, self).__init__(Workspace, MetaFile, Target, Toolchain, Arch, *args, **kwargs)\r
self._InitWorker(Workspace, MetaFile, Target, Toolchain, Arch, *args)\r
self._Init = True\r
\r
\r
self.Workspace = Workspace\r
self.WorkspaceDir = Workspace.WorkspaceDir\r
- self._GuidDict = Workspace._GuidDict\r
self.MetaFile = ModuleFile\r
self.PlatformInfo = PlatformAutoGen(Workspace, PlatformFile, Target, Toolchain, Arch)\r
\r
self.SourceDir = mws.relpath(self.SourceDir, self.WorkspaceDir)\r
\r
self.SourceOverrideDir = None\r
- # use overrided path defined in DSC file\r
+ # use overridden path defined in DSC file\r
if self.MetaFile.Key in GlobalData.gOverrideDir:\r
self.SourceOverrideDir = GlobalData.gOverrideDir[self.MetaFile.Key]\r
\r
self.ToolChainFamily = self.PlatformInfo.ToolChainFamily\r
self.BuildRuleFamily = self.PlatformInfo.BuildRuleFamily\r
\r
- self.IsMakeFileCreated = False\r
self.IsCodeFileCreated = False\r
self.IsAsBuiltInfCreated = False\r
self.DepexGenerated = False\r
## Return the module build data object\r
@cached_property\r
def Module(self):\r
- return self.Workspace.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
+ return self.BuildDatabase[self.MetaFile, self.Arch, self.BuildTarget, self.ToolChain]\r
\r
## Return the module name\r
@cached_property\r
def Guid(self):\r
#\r
# To build same module more than once, the module path with FILE_GUID overridden has\r
- # the file name FILE_GUIDmodule.inf, but the relative path (self.MetaFile.File) is the realy path\r
+ # the file name FILE_GUIDmodule.inf, but the relative path (self.MetaFile.File) is the real path\r
# in DSC. The overridden GUID can be retrieved from file name\r
#\r
if os.path.basename(self.MetaFile.File) != os.path.basename(self.MetaFile.Path):\r
self.MetaFile.BaseName\r
))\r
\r
- ## Return the directory to store the intermediate object files of the mdoule\r
+ ## Return the directory to store the intermediate object files of the module\r
@cached_property\r
def OutputDir(self):\r
return _MakeDir((self.BuildDir, "OUTPUT"))\r
return path.join(self.PlatformInfo.BuildDir, TAB_FV_DIRECTORY, "Ffs", self.Guid + self.Name)\r
return ''\r
\r
- ## Return the directory to store auto-gened source files of the mdoule\r
+ ## Return the directory to store auto-gened source files of the module\r
@cached_property\r
def DebugDir(self):\r
return _MakeDir((self.BuildDir, "DEBUG"))\r
\r
## Get the depex string\r
#\r
- # @return : a string contain all depex expresion.\r
+ # @return : a string contain all depex expression.\r
def _GetDepexExpresionString(self):\r
DepexStr = ''\r
DepexList = []\r
for M in [self.Module] + self.DependentLibraryList:\r
Filename = M.MetaFile.Path\r
InfObj = InfSectionParser.InfSectionParser(Filename)\r
- DepexExpresionList = InfObj.GetDepexExpresionList()\r
- for DepexExpresion in DepexExpresionList:\r
- for key in DepexExpresion:\r
+ DepexExpressionList = InfObj.GetDepexExpresionList()\r
+ for DepexExpression in DepexExpressionList:\r
+ for key in DepexExpression:\r
Arch, ModuleType = key\r
- DepexExpr = [x for x in DepexExpresion[key] if not str(x).startswith('#')]\r
+ DepexExpr = [x for x in DepexExpression[key] if not str(x).startswith('#')]\r
# the type of build module is USER_DEFINED.\r
# All different DEPEX section tags would be copied into the As Built INF file\r
# and there would be separate DEPEX section tags\r
if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:\r
return {}\r
\r
- RetVal = {self.ModuleType:[]}\r
-\r
- for ModuleType in RetVal:\r
- DepexList = RetVal[ModuleType]\r
- #\r
- # Append depex from dependent libraries, if not "BEFORE", "AFTER" expresion\r
- #\r
- for M in [self.Module] + self.DependentLibraryList:\r
- Inherited = False\r
- for D in M.Depex[self.Arch, ModuleType]:\r
- if DepexList != []:\r
- DepexList.append('AND')\r
- DepexList.append('(')\r
- #replace D with value if D is FixedAtBuild PCD\r
- NewList = []\r
- for item in D:\r
- if '.' not in item:\r
- NewList.append(item)\r
+ DepexList = []\r
+ #\r
+ # Append depex from dependent libraries, if not "BEFORE", "AFTER" expression\r
+ #\r
+ for M in [self.Module] + self.DependentLibraryList:\r
+ Inherited = False\r
+ for D in M.Depex[self.Arch, self.ModuleType]:\r
+ if DepexList != []:\r
+ DepexList.append('AND')\r
+ DepexList.append('(')\r
+ #replace D with value if D is FixedAtBuild PCD\r
+ NewList = []\r
+ for item in D:\r
+ if '.' not in item:\r
+ NewList.append(item)\r
+ else:\r
+ if item not in self.FixedVoidTypePcds:\r
+ EdkLogger.error("build", FORMAT_INVALID, "{} used in [Depex] section should be used as FixedAtBuild type and VOID* datum type in the module.".format(item))\r
else:\r
- if item not in self._FixedPcdVoidTypeDict:\r
- EdkLogger.error("build", FORMAT_INVALID, "{} used in [Depex] section should be used as FixedAtBuild type and VOID* datum type in the module.".format(item))\r
- else:\r
- Value = self._FixedPcdVoidTypeDict[item]\r
- if len(Value.split(',')) != 16:\r
- EdkLogger.error("build", FORMAT_INVALID,\r
- "{} used in [Depex] section should be used as FixedAtBuild type and VOID* datum type and 16 bytes in the module.".format(item))\r
- NewList.append(Value)\r
- DepexList.extend(NewList)\r
- if DepexList[-1] == 'END': # no need of a END at this time\r
- DepexList.pop()\r
- DepexList.append(')')\r
- Inherited = True\r
- if Inherited:\r
- EdkLogger.verbose("DEPEX[%s] (+%s) = %s" % (self.Name, M.BaseName, DepexList))\r
- if 'BEFORE' in DepexList or 'AFTER' in DepexList:\r
- break\r
- if len(DepexList) > 0:\r
- EdkLogger.verbose('')\r
- return RetVal\r
+ Value = self.FixedVoidTypePcds[item]\r
+ if len(Value.split(',')) != 16:\r
+ EdkLogger.error("build", FORMAT_INVALID,\r
+ "{} used in [Depex] section should be used as FixedAtBuild type and VOID* datum type and 16 bytes in the module.".format(item))\r
+ NewList.append(Value)\r
+ DepexList.extend(NewList)\r
+ if DepexList[-1] == 'END': # no need of a END at this time\r
+ DepexList.pop()\r
+ DepexList.append(')')\r
+ Inherited = True\r
+ if Inherited:\r
+ EdkLogger.verbose("DEPEX[%s] (+%s) = %s" % (self.Name, M.BaseName, DepexList))\r
+ if 'BEFORE' in DepexList or 'AFTER' in DepexList:\r
+ break\r
+ if len(DepexList) > 0:\r
+ EdkLogger.verbose('')\r
+ return {self.ModuleType:DepexList}\r
\r
## Merge dependency expression\r
#\r
# @retval list The token list of the dependency expression after parsed\r
#\r
@cached_property\r
- def DepexExpressionTokenList(self):\r
+ def DepexExpressionDict(self):\r
if self.DxsFile or self.IsLibrary or TAB_DEPENDENCY_EXPRESSION_FILE in self.FileTypes:\r
return {}\r
\r
- RetVal = {self.ModuleType:''}\r
+ DepexExpressionString = ''\r
+ #\r
+ # Append depex from dependent libraries, if not "BEFORE", "AFTER" expresion\r
+ #\r
+ for M in [self.Module] + self.DependentLibraryList:\r
+ Inherited = False\r
+ for D in M.DepexExpression[self.Arch, self.ModuleType]:\r
+ if DepexExpressionString != '':\r
+ DepexExpressionString += ' AND '\r
+ DepexExpressionString += '('\r
+ DepexExpressionString += D\r
+ DepexExpressionString = DepexExpressionString.rstrip('END').strip()\r
+ DepexExpressionString += ')'\r
+ Inherited = True\r
+ if Inherited:\r
+ EdkLogger.verbose("DEPEX[%s] (+%s) = %s" % (self.Name, M.BaseName, DepexExpressionString))\r
+ if 'BEFORE' in DepexExpressionString or 'AFTER' in DepexExpressionString:\r
+ break\r
+ if len(DepexExpressionString) > 0:\r
+ EdkLogger.verbose('')\r
\r
- for ModuleType in RetVal:\r
- DepexExpressionString = RetVal[ModuleType]\r
- #\r
- # Append depex from dependent libraries, if not "BEFORE", "AFTER" expresion\r
- #\r
- for M in [self.Module] + self.DependentLibraryList:\r
- Inherited = False\r
- for D in M.DepexExpression[self.Arch, ModuleType]:\r
- if DepexExpressionString != '':\r
- DepexExpressionString += ' AND '\r
- DepexExpressionString += '('\r
- DepexExpressionString += D\r
- DepexExpressionString = DepexExpressionString.rstrip('END').strip()\r
- DepexExpressionString += ')'\r
- Inherited = True\r
- if Inherited:\r
- EdkLogger.verbose("DEPEX[%s] (+%s) = %s" % (self.Name, M.BaseName, DepexExpressionString))\r
- if 'BEFORE' in DepexExpressionString or 'AFTER' in DepexExpressionString:\r
- break\r
- if len(DepexExpressionString) > 0:\r
- EdkLogger.verbose('')\r
- RetVal[ModuleType] = DepexExpressionString\r
- return RetVal\r
+ return {self.ModuleType:DepexExpressionString}\r
\r
# Get the tiano core user extension, it is contain dependent library.\r
# @retval: a list contain tiano core userextension.\r
# Regular expression for finding Include Directories, the difference between MSFT and INTEL/GCC/RVCT\r
# is the former use /I , the Latter used -I to specify include directories\r
#\r
- if self.PlatformInfo.ToolChainFamily in ('MSFT'):\r
+ if self.PlatformInfo.ToolChainFamily in (TAB_COMPILER_MSFT):\r
BuildOptIncludeRegEx = gBuildOptIncludePatternMsft\r
elif self.PlatformInfo.ToolChainFamily in ('INTEL', 'GCC', 'RVCT'):\r
BuildOptIncludeRegEx = gBuildOptIncludePatternOther\r
except KeyError:\r
FlagOption = ''\r
\r
- if self.PlatformInfo.ToolChainFamily != 'RVCT':\r
+ if self.ToolChainFamily != 'RVCT':\r
IncPathList = [NormPath(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption)]\r
else:\r
#\r
# EDK II modules must not reference header files outside of the packages they depend on or\r
# within the module's directory tree. Report error if violation.\r
#\r
- if self.AutoGenVersion >= 0x00010005:\r
- for Path in IncPathList:\r
- if (Path not in self.IncludePathList) and (CommonPath([Path, self.MetaFile.Dir]) != self.MetaFile.Dir):\r
- ErrMsg = "The include directory for the EDK II module in this line is invalid %s specified in %s FLAGS '%s'" % (Path, Tool, FlagOption)\r
- EdkLogger.error("build",\r
- PARAMETER_INVALID,\r
- ExtraData=ErrMsg,\r
- File=str(self.MetaFile))\r
+ for Path in IncPathList:\r
+ if (Path not in self.IncludePathList) and (CommonPath([Path, self.MetaFile.Dir]) != self.MetaFile.Dir):\r
+ ErrMsg = "The include directory for the EDK II module in this line is invalid %s specified in %s FLAGS '%s'" % (Path, Tool, FlagOption)\r
+ EdkLogger.error("build",\r
+ PARAMETER_INVALID,\r
+ ExtraData=ErrMsg,\r
+ File=str(self.MetaFile))\r
RetVal += IncPathList\r
return RetVal\r
\r
@cached_property\r
def SourceFileList(self):\r
RetVal = []\r
- ToolChainTagSet = {"", "*", self.ToolChain}\r
- ToolChainFamilySet = {"", "*", self.ToolChainFamily, self.BuildRuleFamily}\r
+ ToolChainTagSet = {"", TAB_STAR, self.ToolChain}\r
+ ToolChainFamilySet = {"", TAB_STAR, self.ToolChainFamily, self.BuildRuleFamily}\r
for F in self.Module.Sources:\r
# match tool chain\r
if F.TagName not in ToolChainTagSet:\r
continue\r
\r
# add the file path into search path list for file including\r
- if F.Dir not in self.IncludePathList and self.AutoGenVersion >= 0x00010005:\r
+ if F.Dir not in self.IncludePathList:\r
self.IncludePathList.insert(0, F.Dir)\r
RetVal.append(F)\r
\r
self.BuildOption\r
for SingleFile in FileList:\r
if self.BuildRuleOrder and SingleFile.Ext in self.BuildRuleOrder and SingleFile.Ext in self.BuildRules:\r
- key = SingleFile.Path.split(SingleFile.Ext)[0]\r
+ key = SingleFile.Path.rsplit(SingleFile.Ext,1)[0]\r
if key in Order_Dict:\r
Order_Dict[key].append(SingleFile.Ext)\r
else:\r
def BinaryFileList(self):\r
RetVal = []\r
for F in self.Module.Binaries:\r
- if F.Target not in [TAB_ARCH_COMMON, '*'] and F.Target != self.BuildTarget:\r
+ if F.Target not in [TAB_ARCH_COMMON, TAB_STAR] and F.Target != self.BuildTarget:\r
continue\r
RetVal.append(F)\r
self._ApplyBuildRule(F, F.Type, BinaryFileList=RetVal)\r
AutoFile = PathClass(gAutoGenStringFileName % {"module_name":self.Name}, self.DebugDir)\r
RetVal[AutoFile] = str(StringH)\r
self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)\r
- if UniStringBinBuffer is not None and UniStringBinBuffer.getvalue() != "":\r
+ if UniStringBinBuffer is not None and UniStringBinBuffer.getvalue() != b"":\r
AutoFile = PathClass(gAutoGenStringFormFileName % {"module_name":self.Name}, self.OutputDir)\r
RetVal[AutoFile] = UniStringBinBuffer.getvalue()\r
AutoFile.IsBinary = True\r
AutoFile = PathClass(gAutoGenImageDefFileName % {"module_name":self.Name}, self.DebugDir)\r
RetVal[AutoFile] = str(StringIdf)\r
self._ApplyBuildRule(AutoFile, TAB_UNKNOWN_FILE)\r
- if IdfGenBinBuffer is not None and IdfGenBinBuffer.getvalue() != "":\r
+ if IdfGenBinBuffer is not None and IdfGenBinBuffer.getvalue() != b"":\r
AutoFile = PathClass(gAutoGenIdfFileName % {"module_name":self.Name}, self.OutputDir)\r
RetVal[AutoFile] = IdfGenBinBuffer.getvalue()\r
AutoFile.IsBinary = True\r
IdfGenBinBuffer.close()\r
return RetVal\r
\r
- ## Return the list of library modules explicitly or implicityly used by this module\r
+ ## Return the list of library modules explicitly or implicitly used by this module\r
@cached_property\r
def DependentLibraryList(self):\r
# only merge library classes and PCD for non-library module\r
if self.IsLibrary:\r
return []\r
- if self.AutoGenVersion < 0x00010005:\r
- return self.PlatformInfo.ResolveLibraryReference(self.Module)\r
return self.PlatformInfo.ApplyLibraryInstance(self.Module)\r
\r
## Get the list of PCDs from current module\r
@cached_property\r
def IncludePathList(self):\r
RetVal = []\r
- if self.AutoGenVersion < 0x00010005:\r
- for Inc in self.Module.Includes:\r
- if Inc not in RetVal:\r
- RetVal.append(Inc)\r
- # for Edk modules\r
- Inc = path.join(Inc, self.Arch.capitalize())\r
- if os.path.exists(Inc) and Inc not in RetVal:\r
- RetVal.append(Inc)\r
- # Edk module needs to put DEBUG_DIR at the end of search path and not to use SOURCE_DIR all the time\r
- RetVal.append(self.DebugDir)\r
- else:\r
- RetVal.append(self.MetaFile.Dir)\r
- RetVal.append(self.DebugDir)\r
+ RetVal.append(self.MetaFile.Dir)\r
+ RetVal.append(self.DebugDir)\r
\r
for Package in self.Module.Packages:\r
PackageDir = mws.join(self.WorkspaceDir, Package.MetaFile.Dir)\r
Guid = gEfiVarStoreGuidPattern.search(Content, Pos)\r
if not Guid:\r
break\r
- NameArray = ConvertStringToByteArray('L"' + Name.group(1) + '"')\r
+ NameArray = _ConvertStringToByteArray('L"' + Name.group(1) + '"')\r
NameGuids.add((NameArray, GuidStructureStringToGuidString(Guid.group(1))))\r
Pos = Content.find('efivarstore', Name.end())\r
if not NameGuids:\r
Value = GuidValue(SkuInfo.VariableGuid, self.PlatformInfo.PackageList, self.MetaFile.Path)\r
if not Value:\r
continue\r
- Name = ConvertStringToByteArray(SkuInfo.VariableName)\r
+ Name = _ConvertStringToByteArray(SkuInfo.VariableName)\r
Guid = GuidStructureStringToGuidString(Value)\r
if (Name, Guid) in NameGuids and Pcd not in HiiExPcds:\r
HiiExPcds.append(Pcd)\r
return None\r
MapFileName = os.path.join(self.OutputDir, self.Name + ".map")\r
EfiFileName = os.path.join(self.OutputDir, self.Name + ".efi")\r
- VfrUniOffsetList = GetVariableOffset(MapFileName, EfiFileName, VfrUniBaseName.values())\r
+ VfrUniOffsetList = GetVariableOffset(MapFileName, EfiFileName, list(VfrUniBaseName.values()))\r
if not VfrUniOffsetList:\r
return None\r
\r
EdkLogger.error("build", FILE_OPEN_FAILURE, "File open failed for %s" % UniVfrOffsetFileName, None)\r
\r
# Use a instance of BytesIO to cache data\r
- fStringIO = BytesIO('')\r
+ fStringIO = BytesIO()\r
\r
for Item in VfrUniOffsetList:\r
if (Item[0].find("Strings") != -1):\r
# GUID + Offset\r
# { 0x8913c5e0, 0x33f6, 0x4d86, { 0x9b, 0xf1, 0x43, 0xef, 0x89, 0xfc, 0x6, 0x66 } }\r
#\r
- UniGuid = [0xe0, 0xc5, 0x13, 0x89, 0xf6, 0x33, 0x86, 0x4d, 0x9b, 0xf1, 0x43, 0xef, 0x89, 0xfc, 0x6, 0x66]\r
- UniGuid = [chr(ItemGuid) for ItemGuid in UniGuid]\r
- fStringIO.write(''.join(UniGuid))\r
+ UniGuid = b'\xe0\xc5\x13\x89\xf63\x86M\x9b\xf1C\xef\x89\xfc\x06f'\r
+ fStringIO.write(UniGuid)\r
UniValue = pack ('Q', int (Item[1], 16))\r
fStringIO.write (UniValue)\r
else:\r
# GUID + Offset\r
# { 0xd0bc7cb4, 0x6a47, 0x495f, { 0xaa, 0x11, 0x71, 0x7, 0x46, 0xda, 0x6, 0xa2 } };\r
#\r
- VfrGuid = [0xb4, 0x7c, 0xbc, 0xd0, 0x47, 0x6a, 0x5f, 0x49, 0xaa, 0x11, 0x71, 0x7, 0x46, 0xda, 0x6, 0xa2]\r
- VfrGuid = [chr(ItemGuid) for ItemGuid in VfrGuid]\r
- fStringIO.write(''.join(VfrGuid))\r
+ VfrGuid = b'\xb4|\xbc\xd0Gj_I\xaa\x11q\x07F\xda\x06\xa2'\r
+ fStringIO.write(VfrGuid)\r
VfrValue = pack ('Q', int (Item[1], 16))\r
fStringIO.write (VfrValue)\r
#\r
if self.IsAsBuiltInfCreated:\r
return\r
\r
- # Skip the following code for EDK I inf\r
- if self.AutoGenVersion < 0x00010005:\r
- return\r
-\r
# Skip the following code for libraries\r
if self.IsLibrary:\r
return\r
AsBuiltInfDict['binary_item'].append('PE32|' + self.Name + '.efi')\r
else:\r
AsBuiltInfDict['binary_item'].append('BIN|' + File)\r
+ if not self.DepexGenerated:\r
+ DepexFile = os.path.join(self.OutputDir, self.Name + '.depex')\r
+ if os.path.exists(DepexFile):\r
+ self.DepexGenerated = True\r
if self.DepexGenerated:\r
self.OutputFile.add(self.Name + '.depex')\r
if self.ModuleType in [SUP_MODULE_PEIM]:\r
Padding = '0x00, '\r
if Unicode:\r
Padding = Padding * 2\r
- ArraySize = ArraySize / 2\r
+ ArraySize = ArraySize // 2\r
if ArraySize < (len(PcdValue) + 1):\r
if Pcd.MaxSizeUserSet:\r
EdkLogger.error("build", AUTOGEN_ERROR,\r
AsBuiltInfDict['userextension_tianocore_item'] = UserExtStr\r
\r
# Generated depex expression section in comments.\r
- DepexExpresion = self._GetDepexExpresionString()\r
- AsBuiltInfDict['depexsection_item'] = DepexExpresion if DepexExpresion else ''\r
+ DepexExpression = self._GetDepexExpresionString()\r
+ AsBuiltInfDict['depexsection_item'] = DepexExpression if DepexExpression else ''\r
\r
AsBuiltInf = TemplateString()\r
AsBuiltInf.Append(gAsBuiltInfHeaderString.Replace(AsBuiltInfDict))\r
if os.path.exists(ModuleFile):\r
shutil.copy2(ModuleFile, FileDir)\r
if not self.OutputFile:\r
- Ma = self.Workspace.BuildDatabase[PathClass(ModuleFile), self.Arch, self.BuildTarget, self.ToolChain]\r
+ Ma = self.BuildDatabase[PathClass(ModuleFile), self.Arch, self.BuildTarget, self.ToolChain]\r
self.OutputFile = Ma.Binaries\r
if self.OutputFile:\r
for File in self.OutputFile:\r
# @param CreateLibraryMakeFile Flag indicating if or not the makefiles of\r
# dependent libraries will be created\r
#\r
+ @cached_class_function\r
def CreateMakeFile(self, CreateLibraryMakeFile=True, GenFfsList = []):\r
+ # nest this function inside it's only caller.\r
+ def CreateTimeStamp():\r
+ FileSet = {self.MetaFile.Path}\r
+\r
+ for SourceFile in self.Module.Sources:\r
+ FileSet.add (SourceFile.Path)\r
+\r
+ for Lib in self.DependentLibraryList:\r
+ FileSet.add (Lib.MetaFile.Path)\r
+\r
+ for f in self.AutoGenDepSet:\r
+ FileSet.add (f.Path)\r
+\r
+ if os.path.exists (self.TimeStampPath):\r
+ os.remove (self.TimeStampPath)\r
+ with open(self.TimeStampPath, 'w+') as file:\r
+ for f in FileSet:\r
+ print(f, file=file)\r
+\r
# Ignore generating makefile when it is a binary module\r
if self.IsBinaryModule:\r
return\r
\r
- if self.IsMakeFileCreated:\r
- return\r
self.GenFfsList = GenFfsList\r
if not self.IsLibrary and CreateLibraryMakeFile:\r
for LibraryAutoGen in self.LibraryAutoGenList:\r
EdkLogger.debug(EdkLogger.DEBUG_9, "Skipped the generation of makefile for module %s [%s]" %\r
(self.Name, self.Arch))\r
\r
- self.CreateTimeStamp()\r
- self.IsMakeFileCreated = True\r
+ CreateTimeStamp()\r
\r
def CopyBinaryFiles(self):\r
for File in self.Module.Binaries:\r
\r
for File in self.AutoGenFileList:\r
if GenC.Generate(File.Path, self.AutoGenFileList[File], File.IsBinary):\r
- #Ignore Edk AutoGen.c\r
- if self.AutoGenVersion < 0x00010005 and File.Name == 'AutoGen.c':\r
- continue\r
-\r
AutoGenList.append(str(File))\r
else:\r
IgoredAutoGenList.append(str(File))\r
\r
- # Skip the following code for EDK I inf\r
- if self.AutoGenVersion < 0x00010005:\r
- return\r
\r
for ModuleType in self.DepexList:\r
# Ignore empty [depex] section or [depex] section for SUP_MODULE_USER_DEFINED module\r
GlobalData.gModuleHash[self.Arch] = {}\r
m = hashlib.md5()\r
# Add Platform level hash\r
- m.update(GlobalData.gPlatformHash)\r
+ m.update(GlobalData.gPlatformHash.encode('utf-8'))\r
# Add Package level hash\r
if self.DependentPackageList:\r
for Pkg in sorted(self.DependentPackageList, key=lambda x: x.PackageName):\r
if Pkg.PackageName in GlobalData.gPackageHash[self.Arch]:\r
- m.update(GlobalData.gPackageHash[self.Arch][Pkg.PackageName])\r
+ m.update(GlobalData.gPackageHash[self.Arch][Pkg.PackageName].encode('utf-8'))\r
\r
# Add Library hash\r
if self.LibraryAutoGenList:\r
for Lib in sorted(self.LibraryAutoGenList, key=lambda x: x.Name):\r
if Lib.Name not in GlobalData.gModuleHash[self.Arch]:\r
Lib.GenModuleHash()\r
- m.update(GlobalData.gModuleHash[self.Arch][Lib.Name])\r
+ m.update(GlobalData.gModuleHash[self.Arch][Lib.Name].encode('utf-8'))\r
\r
# Add Module self\r
- f = open(str(self.MetaFile), 'r')\r
+ f = open(str(self.MetaFile), 'rb')\r
Content = f.read()\r
f.close()\r
m.update(Content)\r
# Add Module's source files\r
if self.SourceFileList:\r
for File in sorted(self.SourceFileList, key=lambda x: str(x)):\r
- f = open(str(File), 'r')\r
+ f = open(str(File), 'rb')\r
Content = f.read()\r
f.close()\r
m.update(Content)\r
if GlobalData.gBinCacheSource:\r
if self.AttemptModuleCacheCopy():\r
return False\r
- return SaveFileOnChange(ModuleHashFile, m.hexdigest(), True)\r
+ return SaveFileOnChange(ModuleHashFile, m.hexdigest(), False)\r
\r
## Decide whether we can skip the ModuleAutoGen process\r
def CanSkipbyHash(self):\r
@cached_property\r
def TimeStampPath(self):\r
return os.path.join(self.MakeFileDir, 'AutoGenTimeStamp')\r
-\r
- def CreateTimeStamp(self):\r
- FileSet = {self.MetaFile.Path}\r
-\r
- for SourceFile in self.Module.Sources:\r
- FileSet.add (SourceFile.Path)\r
-\r
- for Lib in self.DependentLibraryList:\r
- FileSet.add (Lib.MetaFile.Path)\r
-\r
- for f in self.AutoGenDepSet:\r
- FileSet.add (f.Path)\r
-\r
- if os.path.exists (self.TimeStampPath):\r
- os.remove (self.TimeStampPath)\r
- with open(self.TimeStampPath, 'w+') as file:\r
- for f in FileSet:\r
- print(f, file=file)\r