BaseTools: Various typo
Various typo in BaseTools. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Coeur <coeur@gmx.fr> Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
committed by
Liming Gao
parent
325ad62260
commit
fb0b35e05f
@@ -1187,7 +1187,7 @@ class PlatformAutoGen(AutoGen):
|
||||
#
|
||||
@cached_class_function
|
||||
def CreateCodeFile(self, CreateModuleCodeFile=False):
|
||||
# only module has code to be greated, so do nothing if CreateModuleCodeFile is False
|
||||
# only module has code to be created, so do nothing if CreateModuleCodeFile is False
|
||||
if not CreateModuleCodeFile:
|
||||
return
|
||||
|
||||
@@ -1849,7 +1849,7 @@ class PlatformAutoGen(AutoGen):
|
||||
|
||||
## Get tool chain definition
|
||||
#
|
||||
# Get each tool defition for given tool chain from tools_def.txt and platform
|
||||
# Get each tool definition for given tool chain from tools_def.txt and platform
|
||||
#
|
||||
@cached_property
|
||||
def ToolDefinition(self):
|
||||
@@ -2130,8 +2130,8 @@ class PlatformAutoGen(AutoGen):
|
||||
|
||||
## Override PCD setting (type, value, ...)
|
||||
#
|
||||
# @param ToPcd The PCD to be overrided
|
||||
# @param FromPcd The PCD overrideing from
|
||||
# @param ToPcd The PCD to be overridden
|
||||
# @param FromPcd The PCD overriding from
|
||||
#
|
||||
def _OverridePcd(self, ToPcd, FromPcd, Module="", Msg="", Library=""):
|
||||
#
|
||||
@@ -2218,7 +2218,7 @@ class PlatformAutoGen(AutoGen):
|
||||
|
||||
## Apply PCD setting defined platform to a module
|
||||
#
|
||||
# @param Module The module from which the PCD setting will be overrided
|
||||
# @param Module The module from which the PCD setting will be overridden
|
||||
#
|
||||
# @retval PCD_list The list PCDs with settings from platform
|
||||
#
|
||||
@@ -2450,7 +2450,7 @@ class PlatformAutoGen(AutoGen):
|
||||
|
||||
## Append build options in platform to a module
|
||||
#
|
||||
# @param Module The module to which the build options will be appened
|
||||
# @param Module The module to which the build options will be appended
|
||||
#
|
||||
# @retval options The options appended with build options in platform
|
||||
#
|
||||
@@ -2560,7 +2560,7 @@ class ModuleAutoGen(AutoGen):
|
||||
self.SourceDir = mws.relpath(self.SourceDir, self.WorkspaceDir)
|
||||
|
||||
self.SourceOverrideDir = None
|
||||
# use overrided path defined in DSC file
|
||||
# use overridden path defined in DSC file
|
||||
if self.MetaFile.Key in GlobalData.gOverrideDir:
|
||||
self.SourceOverrideDir = GlobalData.gOverrideDir[self.MetaFile.Key]
|
||||
|
||||
@@ -2685,7 +2685,7 @@ class ModuleAutoGen(AutoGen):
|
||||
def Guid(self):
|
||||
#
|
||||
# To build same module more than once, the module path with FILE_GUID overridden has
|
||||
# the file name FILE_GUIDmodule.inf, but the relative path (self.MetaFile.File) is the realy path
|
||||
# the file name FILE_GUIDmodule.inf, but the relative path (self.MetaFile.File) is the real path
|
||||
# in DSC. The overridden GUID can be retrieved from file name
|
||||
#
|
||||
if os.path.basename(self.MetaFile.File) != os.path.basename(self.MetaFile.Path):
|
||||
@@ -2745,7 +2745,7 @@ class ModuleAutoGen(AutoGen):
|
||||
self.MetaFile.BaseName
|
||||
))
|
||||
|
||||
## Return the directory to store the intermediate object files of the mdoule
|
||||
## Return the directory to store the intermediate object files of the module
|
||||
@cached_property
|
||||
def OutputDir(self):
|
||||
return _MakeDir((self.BuildDir, "OUTPUT"))
|
||||
@@ -2757,7 +2757,7 @@ class ModuleAutoGen(AutoGen):
|
||||
return path.join(self.PlatformInfo.BuildDir, TAB_FV_DIRECTORY, "Ffs", self.Guid + self.Name)
|
||||
return ''
|
||||
|
||||
## Return the directory to store auto-gened source files of the mdoule
|
||||
## Return the directory to store auto-gened source files of the module
|
||||
@cached_property
|
||||
def DebugDir(self):
|
||||
return _MakeDir((self.BuildDir, "DEBUG"))
|
||||
@@ -2809,7 +2809,7 @@ class ModuleAutoGen(AutoGen):
|
||||
|
||||
## Get the depex string
|
||||
#
|
||||
# @return : a string contain all depex expresion.
|
||||
# @return : a string contain all depex expression.
|
||||
def _GetDepexExpresionString(self):
|
||||
DepexStr = ''
|
||||
DepexList = []
|
||||
@@ -2819,11 +2819,11 @@ class ModuleAutoGen(AutoGen):
|
||||
for M in [self.Module] + self.DependentLibraryList:
|
||||
Filename = M.MetaFile.Path
|
||||
InfObj = InfSectionParser.InfSectionParser(Filename)
|
||||
DepexExpresionList = InfObj.GetDepexExpresionList()
|
||||
for DepexExpresion in DepexExpresionList:
|
||||
for key in DepexExpresion:
|
||||
DepexExpressionList = InfObj.GetDepexExpresionList()
|
||||
for DepexExpression in DepexExpressionList:
|
||||
for key in DepexExpression:
|
||||
Arch, ModuleType = key
|
||||
DepexExpr = [x for x in DepexExpresion[key] if not str(x).startswith('#')]
|
||||
DepexExpr = [x for x in DepexExpression[key] if not str(x).startswith('#')]
|
||||
# the type of build module is USER_DEFINED.
|
||||
# All different DEPEX section tags would be copied into the As Built INF file
|
||||
# and there would be separate DEPEX section tags
|
||||
@@ -2878,7 +2878,7 @@ class ModuleAutoGen(AutoGen):
|
||||
|
||||
DepexList = []
|
||||
#
|
||||
# Append depex from dependent libraries, if not "BEFORE", "AFTER" expresion
|
||||
# Append depex from dependent libraries, if not "BEFORE", "AFTER" expression
|
||||
#
|
||||
for M in [self.Module] + self.DependentLibraryList:
|
||||
Inherited = False
|
||||
@@ -3323,7 +3323,7 @@ class ModuleAutoGen(AutoGen):
|
||||
IdfGenBinBuffer.close()
|
||||
return RetVal
|
||||
|
||||
## Return the list of library modules explicitly or implicityly used by this module
|
||||
## Return the list of library modules explicitly or implicitly used by this module
|
||||
@cached_property
|
||||
def DependentLibraryList(self):
|
||||
# only merge library classes and PCD for non-library module
|
||||
@@ -3894,8 +3894,8 @@ class ModuleAutoGen(AutoGen):
|
||||
AsBuiltInfDict['userextension_tianocore_item'] = UserExtStr
|
||||
|
||||
# Generated depex expression section in comments.
|
||||
DepexExpresion = self._GetDepexExpresionString()
|
||||
AsBuiltInfDict['depexsection_item'] = DepexExpresion if DepexExpresion else ''
|
||||
DepexExpression = self._GetDepexExpresionString()
|
||||
AsBuiltInfDict['depexsection_item'] = DepexExpression if DepexExpression else ''
|
||||
|
||||
AsBuiltInf = TemplateString()
|
||||
AsBuiltInf.Append(gAsBuiltInfHeaderString.Replace(AsBuiltInfDict))
|
||||
|
@@ -92,8 +92,8 @@ class FileBuildRule:
|
||||
|
||||
## constructor
|
||||
#
|
||||
# @param Input The dictionary represeting input file(s) for a rule
|
||||
# @param Output The list represeting output file(s) for a rule
|
||||
# @param Input The dictionary representing input file(s) for a rule
|
||||
# @param Output The list representing output file(s) for a rule
|
||||
# @param Command The list containing commands to generate the output from input
|
||||
#
|
||||
def __init__(self, Type, Input, Output, Command, ExtraDependency=None):
|
||||
@@ -193,7 +193,7 @@ class FileBuildRule:
|
||||
# @param RelativeToDir The relative path of the source file
|
||||
# @param PathSeparator Path separator
|
||||
#
|
||||
# @retval tuple (Source file in full path, List of individual sourcefiles, Destionation file, List of build commands)
|
||||
# @retval tuple (Source file in full path, List of individual sourcefiles, Destination file, List of build commands)
|
||||
#
|
||||
def Apply(self, SourceFile, BuildRuleOrder=None):
|
||||
if not self.CommandList or not self.DestFileList:
|
||||
@@ -396,7 +396,7 @@ class BuildRule:
|
||||
# @param LineIndex The line index of build rule text
|
||||
#
|
||||
def ParseSubSection(self, LineIndex):
|
||||
# currenly nothing here
|
||||
# currently nothing here
|
||||
pass
|
||||
|
||||
## Placeholder for not supported sections
|
||||
@@ -409,7 +409,7 @@ class BuildRule:
|
||||
## Merge section information just got into rule database
|
||||
def EndOfSection(self):
|
||||
Database = self.RuleDatabase
|
||||
# if there's specific toochain family, 'COMMON' doesn't make sense any more
|
||||
# if there's specific toolchain family, 'COMMON' doesn't make sense any more
|
||||
if len(self._TotalToolChainFamilySet) > 1 and TAB_COMMON in self._TotalToolChainFamilySet:
|
||||
self._TotalToolChainFamilySet.remove(TAB_COMMON)
|
||||
for Family in self._TotalToolChainFamilySet:
|
||||
@@ -554,7 +554,7 @@ class BuildRule:
|
||||
# @param FileExt The extension of a file
|
||||
# @param ToolChainFamily The tool chain family name
|
||||
# @param BuildVersion The build version number. TAB_STAR means any rule
|
||||
# is applicalbe.
|
||||
# is applicable.
|
||||
#
|
||||
# @retval FileType The file type string
|
||||
# @retval FileBuildRule The object of FileBuildRule
|
||||
|
@@ -959,7 +959,7 @@ cleanlib:
|
||||
NewFile = self.PlaceMacro(str(F), self.Macros)
|
||||
# In order to use file list macro as dependency
|
||||
if T.GenListFile:
|
||||
# gnu tools need forward slash path separater, even on Windows
|
||||
# gnu tools need forward slash path separator, even on Windows
|
||||
self.ListFileMacros[T.ListFileMacro].append(str(F).replace ('\\', '/'))
|
||||
self.FileListMacros[T.FileListMacro].append(NewFile)
|
||||
elif T.GenFileListMacro:
|
||||
@@ -1003,7 +1003,7 @@ cleanlib:
|
||||
## Find dependencies for one source file
|
||||
#
|
||||
# By searching recursively "#include" directive in file, find out all the
|
||||
# files needed by given source file. The dependecies will be only searched
|
||||
# files needed by given source file. The dependencies will be only searched
|
||||
# in given search path list.
|
||||
#
|
||||
# @param File The source file
|
||||
|
@@ -342,7 +342,7 @@ class DbComItemList (DbItemList):
|
||||
Offset = 0
|
||||
if self.ItemSize == 0:
|
||||
#
|
||||
# Variable length, need to calculte one by one
|
||||
# Variable length, need to calculate one by one
|
||||
# The only variable table is stringtable, it is not Composite item, should not reach here
|
||||
#
|
||||
assert(False)
|
||||
@@ -631,7 +631,7 @@ def BuildExDataBase(Dict):
|
||||
Dict['STRING_TABLE_DB_VALUE'] = [StringArrayToList(x) for x in Dict['STRING_TABLE_VALUE']]
|
||||
|
||||
StringTableValue = Dict['STRING_TABLE_DB_VALUE']
|
||||
# when calcute the offset, should use StringTableLen instead of StringTableValue, as string maxium len may be different with actual len
|
||||
# when calcute the offset, should use StringTableLen instead of StringTableValue, as string maximum len may be different with actual len
|
||||
StringTableLen = Dict['STRING_TABLE_LENGTH']
|
||||
DbStringTableLen = DbStringItemList(0, RawDataList = StringTableValue, LenList = StringTableLen)
|
||||
|
||||
@@ -1011,7 +1011,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
|
||||
'SKUID_TABLE_EMPTY' : 'TRUE',
|
||||
'DATABASE_EMPTY' : 'TRUE',
|
||||
'EXMAP_TABLE_EMPTY' : 'TRUE',
|
||||
'PCD_DATABASE_UNINIT_EMPTY' : ' UINT8 dummy; /* PCD_DATABASE_UNINIT is emptry */',
|
||||
'PCD_DATABASE_UNINIT_EMPTY' : ' UINT8 dummy; /* PCD_DATABASE_UNINIT is empty */',
|
||||
'SYSTEM_SKU_ID' : ' SKU_ID SystemSkuId;',
|
||||
'SYSTEM_SKU_ID_VALUE' : '0U'
|
||||
}
|
||||
|
@@ -80,13 +80,13 @@ class InfSectionParser():
|
||||
UserExtensionTianoCore.append({SubSection: SectionDataDict[key]})
|
||||
return UserExtensionTianoCore
|
||||
|
||||
# Get depex expresion
|
||||
# Get depex expression
|
||||
#
|
||||
# @return: a list include some dictionary that key is section and value is a list contain all data.
|
||||
def GetDepexExpresionList(self):
|
||||
DepexExpresionList = []
|
||||
DepexExpressionList = []
|
||||
if not self._FileSectionDataList:
|
||||
return DepexExpresionList
|
||||
return DepexExpressionList
|
||||
for SectionDataDict in self._FileSectionDataList:
|
||||
for key in SectionDataDict:
|
||||
if key.lower() == "[depex]" or key.lower().startswith("[depex."):
|
||||
@@ -105,8 +105,8 @@ class InfSectionParser():
|
||||
SubKey = (SectionList[1], SectionList[2])
|
||||
else:
|
||||
EdkLogger.error("build", AUTOGEN_ERROR, 'Section %s is invalid.' % key)
|
||||
DepexExpresionList.append({SubKey: SectionDataDict[key]})
|
||||
return DepexExpresionList
|
||||
DepexExpressionList.append({SubKey: SectionDataDict[key]})
|
||||
return DepexExpressionList
|
||||
|
||||
|
||||
|
||||
|
@@ -99,12 +99,12 @@ LangConvTable = {'eng':'en', 'fra':'fr', \
|
||||
## GetLanguageCode
|
||||
#
|
||||
# Check the language code read from .UNI file and convert ISO 639-2 codes to RFC 4646 codes if appropriate
|
||||
# ISO 639-2 language codes supported in compatiblity mode
|
||||
# ISO 639-2 language codes supported in compatibility mode
|
||||
# RFC 4646 language codes supported in native mode
|
||||
#
|
||||
# @param LangName: Language codes read from .UNI file
|
||||
#
|
||||
# @retval LangName: Valid lanugage code in RFC 4646 format or None
|
||||
# @retval LangName: Valid language code in RFC 4646 format or None
|
||||
#
|
||||
def GetLanguageCode(LangName, IsCompatibleMode, File):
|
||||
length = len(LangName)
|
||||
|
Reference in New Issue
Block a user