mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-23 13:44:33 +02:00
BaseTools: Typo fixes
Some in error messages, some in local variable names. Signed-off-by: Dionna Glaze <dionnaglaze@google.com>
This commit is contained in:
parent
aca75d3c08
commit
74ac8cc0e8
@ -190,9 +190,9 @@ class PlatformAutoGen(AutoGen):
|
|||||||
Ma.CreateMakeFile(CreateModuleMakeFile, FfsCommand[key])
|
Ma.CreateMakeFile(CreateModuleMakeFile, FfsCommand[key])
|
||||||
else:
|
else:
|
||||||
Ma.CreateMakeFile(CreateModuleMakeFile)
|
Ma.CreateMakeFile(CreateModuleMakeFile)
|
||||||
self.CreateLibModuelDirs()
|
self.CreateLibModuleDirs()
|
||||||
|
|
||||||
def CreateLibModuelDirs(self):
|
def CreateLibModuleDirs(self):
|
||||||
# No need to create makefile for the platform more than once.
|
# No need to create makefile for the platform more than once.
|
||||||
if self.MakeFileName:
|
if self.MakeFileName:
|
||||||
return
|
return
|
||||||
|
@ -155,7 +155,7 @@ class EfiSection (EfiSectionClassObject):
|
|||||||
#if VerString == '' and
|
#if VerString == '' and
|
||||||
if BuildNumString == '':
|
if BuildNumString == '':
|
||||||
if self.Optional == True :
|
if self.Optional == True :
|
||||||
GenFdsGlobalVariable.VerboseLogger( "Optional Section don't exist!")
|
GenFdsGlobalVariable.VerboseLogger( "Optional Section doesn't exist!")
|
||||||
return [], None
|
return [], None
|
||||||
else:
|
else:
|
||||||
EdkLogger.error("GenFds", GENFDS_ERROR, "File: %s miss Version Section value" %InfFileName)
|
EdkLogger.error("GenFds", GENFDS_ERROR, "File: %s miss Version Section value" %InfFileName)
|
||||||
|
@ -151,7 +151,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
|||||||
#
|
#
|
||||||
def __InfParse__(self, Dict = None, IsGenFfs=False):
|
def __InfParse__(self, Dict = None, IsGenFfs=False):
|
||||||
|
|
||||||
GenFdsGlobalVariable.VerboseLogger( " Begine parsing INf file : %s" %self.InfFileName)
|
GenFdsGlobalVariable.VerboseLogger( " Begin parsing INF file : %s" %self.InfFileName)
|
||||||
|
|
||||||
self.InfFileName = self.InfFileName.replace('$(WORKSPACE)', '')
|
self.InfFileName = self.InfFileName.replace('$(WORKSPACE)', '')
|
||||||
if len(self.InfFileName) > 1 and self.InfFileName[0] == '\\' and self.InfFileName[1] == '\\':
|
if len(self.InfFileName) > 1 and self.InfFileName[0] == '\\' and self.InfFileName[1] == '\\':
|
||||||
@ -169,7 +169,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
|||||||
if not os.path.exists(InfPath):
|
if not os.path.exists(InfPath):
|
||||||
InfPath = GenFdsGlobalVariable.ReplaceWorkspaceMacro(InfPath)
|
InfPath = GenFdsGlobalVariable.ReplaceWorkspaceMacro(InfPath)
|
||||||
if not os.path.exists(InfPath):
|
if not os.path.exists(InfPath):
|
||||||
EdkLogger.error("GenFds", GENFDS_ERROR, "Non-existant Module %s !" % (self.InfFileName))
|
EdkLogger.error("GenFds", GENFDS_ERROR, "Non-existent Module %s !" % (self.InfFileName))
|
||||||
|
|
||||||
self.CurrentArch = self.GetCurrentArch()
|
self.CurrentArch = self.GetCurrentArch()
|
||||||
#
|
#
|
||||||
@ -365,7 +365,7 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
|||||||
os.makedirs(self.OutputPath)
|
os.makedirs(self.OutputPath)
|
||||||
|
|
||||||
self.EfiOutputPath, self.EfiDebugPath = self.__GetEFIOutPutPath__()
|
self.EfiOutputPath, self.EfiDebugPath = self.__GetEFIOutPutPath__()
|
||||||
GenFdsGlobalVariable.VerboseLogger( "ModuelEFIPath: " + self.EfiOutputPath)
|
GenFdsGlobalVariable.VerboseLogger( "ModuleEFIPath: " + self.EfiOutputPath)
|
||||||
|
|
||||||
## PatchEfiFile
|
## PatchEfiFile
|
||||||
#
|
#
|
||||||
@ -1130,5 +1130,3 @@ class FfsInfStatement(FfsInfStatementClassObject):
|
|||||||
EdkLogger.error("GenFds", FILE_WRITE_FAILURE, "Write data to file %s failed, please check whether the file been locked or using by other applications." %UniVfrOffsetFileName, None)
|
EdkLogger.error("GenFds", FILE_WRITE_FAILURE, "Write data to file %s failed, please check whether the file been locked or using by other applications." %UniVfrOffsetFileName, None)
|
||||||
|
|
||||||
fStringIO.close ()
|
fStringIO.close ()
|
||||||
|
|
||||||
|
|
||||||
|
@ -424,7 +424,7 @@ class ExternObject(CommonPropertiesObject):
|
|||||||
class DepexObject(CommonPropertiesObject):
|
class DepexObject(CommonPropertiesObject):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.Depex = ''
|
self.Depex = ''
|
||||||
self.ModuelType = ''
|
self.ModuleType = ''
|
||||||
CommonPropertiesObject.__init__(self)
|
CommonPropertiesObject.__init__(self)
|
||||||
|
|
||||||
def SetDepex(self, Depex):
|
def SetDepex(self, Depex):
|
||||||
@ -434,10 +434,10 @@ class DepexObject(CommonPropertiesObject):
|
|||||||
return self.Depex
|
return self.Depex
|
||||||
|
|
||||||
def SetModuleType(self, ModuleType):
|
def SetModuleType(self, ModuleType):
|
||||||
self.ModuelType = ModuleType
|
self.ModuleType = ModuleType
|
||||||
|
|
||||||
def GetModuleType(self):
|
def GetModuleType(self):
|
||||||
return self.ModuelType
|
return self.ModuleType
|
||||||
|
|
||||||
##
|
##
|
||||||
# PackageDependencyObject
|
# PackageDependencyObject
|
||||||
|
@ -42,7 +42,7 @@ def GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain):
|
|||||||
for ModuleFile in Platform.Modules:
|
for ModuleFile in Platform.Modules:
|
||||||
Data = BuildDatabase[ModuleFile, Arch, Target, Toolchain]
|
Data = BuildDatabase[ModuleFile, Arch, Target, Toolchain]
|
||||||
PkgSet.update(Data.Packages)
|
PkgSet.update(Data.Packages)
|
||||||
for Lib in GetLiabraryInstances(Data, Platform, BuildDatabase, Arch, Target, Toolchain):
|
for Lib in GetLibraryInstances(Data, Platform, BuildDatabase, Arch, Target, Toolchain):
|
||||||
PkgSet.update(Lib.Packages)
|
PkgSet.update(Lib.Packages)
|
||||||
return list(PkgSet)
|
return list(PkgSet)
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalP
|
|||||||
# @param Toolchain: Current toolchain
|
# @param Toolchain: Current toolchain
|
||||||
# @retval: List of dependent libraries which are InfBuildData instances
|
# @retval: List of dependent libraries which are InfBuildData instances
|
||||||
#
|
#
|
||||||
def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):
|
def GetLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):
|
||||||
return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain,Platform.MetaFile,EdkLogger)
|
return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain,Platform.MetaFile,EdkLogger)
|
||||||
|
|
||||||
def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):
|
def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):
|
||||||
|
@ -1281,7 +1281,7 @@ class Build():
|
|||||||
mqueue.put((None,None,None,None,None,None,None))
|
mqueue.put((None,None,None,None,None,None,None))
|
||||||
AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}
|
AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}
|
||||||
AutoGenObject.DataPipe.DataContainer = {"Workspace_timestamp": AutoGenObject.Workspace._SrcTimeStamp}
|
AutoGenObject.DataPipe.DataContainer = {"Workspace_timestamp": AutoGenObject.Workspace._SrcTimeStamp}
|
||||||
AutoGenObject.CreateLibModuelDirs()
|
AutoGenObject.CreateLibModuleDirs()
|
||||||
AutoGenObject.DataPipe.DataContainer = {"LibraryBuildDirectoryList":AutoGenObject.LibraryBuildDirectoryList}
|
AutoGenObject.DataPipe.DataContainer = {"LibraryBuildDirectoryList":AutoGenObject.LibraryBuildDirectoryList}
|
||||||
AutoGenObject.DataPipe.DataContainer = {"ModuleBuildDirectoryList":AutoGenObject.ModuleBuildDirectoryList}
|
AutoGenObject.DataPipe.DataContainer = {"ModuleBuildDirectoryList":AutoGenObject.ModuleBuildDirectoryList}
|
||||||
AutoGenObject.DataPipe.DataContainer = {"FdsCommandDict": AutoGenObject.Workspace.GenFdsCommandDict}
|
AutoGenObject.DataPipe.DataContainer = {"FdsCommandDict": AutoGenObject.Workspace.GenFdsCommandDict}
|
||||||
@ -2200,7 +2200,7 @@ class Build():
|
|||||||
Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}
|
Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}
|
||||||
Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}
|
Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}
|
||||||
Pa.DataPipe.DataContainer = {"CommandTarget": self.Target}
|
Pa.DataPipe.DataContainer = {"CommandTarget": self.Target}
|
||||||
Pa.CreateLibModuelDirs()
|
Pa.CreateLibModuleDirs()
|
||||||
# Fetch the MakeFileName.
|
# Fetch the MakeFileName.
|
||||||
self.MakeFileName = Pa.MakeFileName
|
self.MakeFileName = Pa.MakeFileName
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user