From 74ac8cc0e81272b52f66b3e259e497fa628ab49d Mon Sep 17 00:00:00 2001 From: Dionna Glaze Date: Mon, 9 Dec 2024 18:42:33 +0000 Subject: BaseTools: Typo fixes Some in error messages, some in local variable names. Signed-off-by: Dionna Glaze --- BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 4 ++-- BaseTools/Source/Python/GenFds/EfiSection.py | 2 +- BaseTools/Source/Python/GenFds/FfsInfStatement.py | 8 +++----- BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py | 6 +++--- BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 4 ++-- BaseTools/Source/Python/build/build.py | 4 ++-- 6 files changed, 13 insertions(+), 15 deletions(-) (limited to 'BaseTools') diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py index dac81454a9..e80203dce2 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -190,9 +190,9 @@ class PlatformAutoGen(AutoGen): Ma.CreateMakeFile(CreateModuleMakeFile, FfsCommand[key]) else: Ma.CreateMakeFile(CreateModuleMakeFile) - self.CreateLibModuelDirs() + self.CreateLibModuleDirs() - def CreateLibModuelDirs(self): + def CreateLibModuleDirs(self): # No need to create makefile for the platform more than once. if self.MakeFileName: return diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py index fd58391dac..ca7a447008 100644 --- a/BaseTools/Source/Python/GenFds/EfiSection.py +++ b/BaseTools/Source/Python/GenFds/EfiSection.py @@ -155,7 +155,7 @@ class EfiSection (EfiSectionClassObject): #if VerString == '' and if BuildNumString == '': if self.Optional == True : - GenFdsGlobalVariable.VerboseLogger( "Optional Section don't exist!") + GenFdsGlobalVariable.VerboseLogger( "Optional Section doesn't exist!") return [], None else: EdkLogger.error("GenFds", GENFDS_ERROR, "File: %s miss Version Section value" %InfFileName) diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py index ec9713484e..4e26a5af9d 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -151,7 +151,7 @@ class FfsInfStatement(FfsInfStatementClassObject): # 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)', '') 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): InfPath = GenFdsGlobalVariable.ReplaceWorkspaceMacro(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() # @@ -365,7 +365,7 @@ class FfsInfStatement(FfsInfStatementClassObject): os.makedirs(self.OutputPath) self.EfiOutputPath, self.EfiDebugPath = self.__GetEFIOutPutPath__() - GenFdsGlobalVariable.VerboseLogger( "ModuelEFIPath: " + self.EfiOutputPath) + GenFdsGlobalVariable.VerboseLogger( "ModuleEFIPath: " + self.EfiOutputPath) ## 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) fStringIO.close () - - diff --git a/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py b/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py index 6e515a2c3f..895f3b6925 100644 --- a/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py +++ b/BaseTools/Source/Python/UPT/Object/POM/ModuleObject.py @@ -424,7 +424,7 @@ class ExternObject(CommonPropertiesObject): class DepexObject(CommonPropertiesObject): def __init__(self): self.Depex = '' - self.ModuelType = '' + self.ModuleType = '' CommonPropertiesObject.__init__(self) def SetDepex(self, Depex): @@ -434,10 +434,10 @@ class DepexObject(CommonPropertiesObject): return self.Depex def SetModuleType(self, ModuleType): - self.ModuelType = ModuleType + self.ModuleType = ModuleType def GetModuleType(self): - return self.ModuelType + return self.ModuleType ## # PackageDependencyObject diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py index 6ad7a3b940..7ac3b5bbe8 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -42,7 +42,7 @@ def GetPackageList(Platform, BuildDatabase, Arch, Target, Toolchain): for ModuleFile in Platform.Modules: Data = BuildDatabase[ModuleFile, Arch, Target, Toolchain] 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) return list(PkgSet) @@ -87,7 +87,7 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalP # @param Toolchain: Current toolchain # @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) def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None): diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index ce1bb87126..5a4f51c580 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1281,7 +1281,7 @@ class Build(): mqueue.put((None,None,None,None,None,None,None)) AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target} AutoGenObject.DataPipe.DataContainer = {"Workspace_timestamp": AutoGenObject.Workspace._SrcTimeStamp} - AutoGenObject.CreateLibModuelDirs() + AutoGenObject.CreateLibModuleDirs() AutoGenObject.DataPipe.DataContainer = {"LibraryBuildDirectoryList":AutoGenObject.LibraryBuildDirectoryList} AutoGenObject.DataPipe.DataContainer = {"ModuleBuildDirectoryList":AutoGenObject.ModuleBuildDirectoryList} AutoGenObject.DataPipe.DataContainer = {"FdsCommandDict": AutoGenObject.Workspace.GenFdsCommandDict} @@ -2200,7 +2200,7 @@ class Build(): Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict} Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp} Pa.DataPipe.DataContainer = {"CommandTarget": self.Target} - Pa.CreateLibModuelDirs() + Pa.CreateLibModuleDirs() # Fetch the MakeFileName. self.MakeFileName = Pa.MakeFileName -- cgit