From mboxrd@z Thu Jan 1 00:00:00 1970 Subject: Re: [edk2-devel] [PATCH] BaseTools: Fix various typos To: Leif Lindholm ,devel@edk2.groups.io From: "Bob Feng" X-Originating-Location: US (192.102.204.45) X-Originating-Platform: Windows Chrome 75 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Thu, 04 Jul 2019 17:29:43 -0700 References: <20190704130331.3muurxmqc6qpnh3f@bivouac.eciton.net> In-Reply-To: <20190704130331.3muurxmqc6qpnh3f@bivouac.eciton.net> Message-ID: <28803.1562286583784879484@groups.io> Content-Type: multipart/alternative; boundary="93nUA7717MGqY9U0Yyun" --93nUA7717MGqY9U0Yyun Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The attached patch looks fine. Reviewed-by: Bob Feng On Thu, Jul 4, 2019 at 09:03 PM, Leif Lindholm wrote: >=20 > +Bob, Liming >=20 > On Wed, Jul 03, 2019 at 08:08:59AM -0700, C=C5=93ur wrote: >=20 >> Fix various typos in BaseTools. >>=20 >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Coeur >> --- >> BaseTools/Conf/XMLSchema/DistributionPackage.xsd=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 8 ++++---- >> .../plugins/EdkPlugins/edk2/model/doxygengen.py=C2=A0 =C2=A0 =C2=A0 =C2= = =A0 =C2=A0 =C2=A0| 2 +- >> .../plugins/EdkPlugins/edk2/model/doxygengen_spec.py=C2=A0 =C2=A0 =C2= =A0 | 2 +- >> BaseTools/Source/C/Common/FirmwareVolumeBuffer.c=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 4 ++-- >> BaseTools/Source/C/Include/Common/BaseTypes.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0| 2 +- >> BaseTools/Source/C/Makefiles/NmakeSubdirs.py=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 2 +- >> BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c=C2=A0 =C2=A0 =C2=A0 =C2= = =A0 =C2=A0 =C2=A0| 2 +- >> BaseTools/Source/C/VfrCompile/Pccts/h/err.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 = = =C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 +- >> BaseTools/Source/Python/AutoGen/AutoGen.py=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 4 ++-- >> BaseTools/Source/Python/BPDG/GenVpd.py=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 6 +++--- >> BaseTools/Source/Python/Common/ToolDefClassObject.py=C2=A0 =C2=A0 =C2= =A0 | 2 +- >> BaseTools/Source/Python/UPT/Library/DataType.py=C2=A0 =C2=A0 =C2=A0 =C2= = =A0 =C2=A0 =C2=A0| 2 +- >> BaseTools/Source/Python/UPT/Library/StringUtils.py=C2=A0 =C2=A0 =C2=A0 = = =C2=A0 | 2 +- >> BaseTools/Source/Python/UPT/Logger/StringTable.py=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 +- >> .../Python/UPT/Object/Parser/InfBuildOptionObject.py=C2=A0 =C2=A0 =C2= =A0 | 2 +- >> 15 files changed, 22 insertions(+), 22 deletions(-) >>=20 >> diff --git a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> index 7499c325c3..67be9c8f32 100644 >> --- a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> +++ b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> @@ -166,7 +166,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> Package. >> >> >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Each Distribution Pac= kage is uniquely identified by it's >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Each Distribution Pac= kage is uniquely identified by its >> GUID and Version number. >> >> >> @@ -363,7 +363,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> Modules. >> >> >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 Each package is uniquely identified by it'= s GUID and Version >> number. >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 Each package is uniquely identified by its= GUID and Version >> number. >> Backward compatible releases of a package need only change the version >> number, while non-backward >> compatible changes require the GUID to change (resetting the version >> number to 1.0 is optional.) >> >> @@ -1168,7 +1168,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> >> >> >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 Each module is uniquely identified by it's= GUID and Version >> number. >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 Each module is uniquely identified by its = GUID and Version >> number. >> Backward compatible releases of a module need only change the version >> number, while non-backward >> compatible changes require the GUID to change (resetting the version >> number to 1.0 is optional.) >> >> @@ -3092,7 +3092,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> >> The Patch PCD is a #define that is set at build time, and that >> can be modified within a binary file. Additional information, such as t= he >> offset location of the >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 value, along with it's lengt= h may need to be provided. >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 value, along with its length= may need to be provided. >> >> >> >> diff --git >> a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py >> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py >>=20 >> index d0274d6afd..89833043c6 100644 >> --- >> a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py >>=20 >> +++ >> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen.py >>=20 >> @@ -792,7 +792,7 @@ class PackageDocumentAction(DoxygenAction): >> Generate page for a module/library. >> @param infObj=C2=A0 =C2=A0 =C2=A0INF file object for module/library >> @param configFile doxygen config file object >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 @param isLib=C2=A0 =C2=A0 =C2=A0 Whether t= his module is libary >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 @param isLib=C2=A0 =C2=A0 =C2=A0 Whether t= his module is library >>=20 >> @param module doxygen page object >> """ >> diff --git >> a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py >> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py >>=20 >> index 3ba4eed55e..e37938c466 100644 >> --- >> a/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py >>=20 >> +++ >> b/BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/= doxygengen_spec.py >>=20 >> @@ -793,7 +793,7 @@ class PackageDocumentAction(DoxygenAction): >> Generate page for a module/library. >> @param infObj=C2=A0 =C2=A0 =C2=A0INF file object for module/library >> @param configFile doxygen config file object >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 @param isLib=C2=A0 =C2=A0 =C2=A0 Whether t= his module is libary >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 @param isLib=C2=A0 =C2=A0 =C2=A0 Whether t= his module is library >>=20 >> @param module doxygen page object >> """ >> diff --git a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c >> b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c >> index 6e1914be29..70741c8afc 100644 >> --- a/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c >> +++ b/BaseTools/Source/C/Common/FirmwareVolumeBuffer.c >> @@ -937,7 +937,7 @@ Arguments: >>=20 >> Fv - Address of the Fv in memory >> Key - Should be 0 to get the first file.=C2=A0 After that, it should be >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 passed back in without modifying it's cont= ents to retrieve >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 passed back in without modifying its conte= nts to retrieve >> subsequent files. >> File - Output file pointer >> File =3D=3D NULL - invalid parameter >> @@ -1323,7 +1323,7 @@ Arguments: >> SectionsStart - Address of the start of the FFS sections array >> TotalSectionsSize - Total size of all the sections >> Key - Should be 0 to get the first section.=C2=A0 After that, it should= be >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 passed back in without modifying it's cont= ents to retrieve >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 passed back in without modifying its conte= nts to retrieve >> subsequent files. >> Section - Output section pointer >> (Section =3D=3D NULL) -> invalid parameter >> diff --git a/BaseTools/Source/C/Include/Common/BaseTypes.h >> b/BaseTools/Source/C/Include/Common/BaseTypes.h >> index 9844d1d514..31d0662085 100644 >> --- a/BaseTools/Source/C/Include/Common/BaseTypes.h >> +++ b/BaseTools/Source/C/Include/Common/BaseTypes.h >> @@ -151,7 +151,7 @@ typedef struct { >>=20 >> /// >> ///=C2=A0 _CR - returns a pointer to the structure >> -///=C2=A0 =C2=A0 =C2=A0 from one of it's elements. >> +///=C2=A0 =C2=A0 =C2=A0 from one of its elements. >> /// >> #define _CR(Record, TYPE, Field)=C2=A0 ((TYPE *) ((CHAR8 *) (Record) - = (CHAR8 >> *) &(((TYPE *) 0)->Field))) >>=20 >> diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py >> b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py >> index 30a481613e..356f5aca63 100644 >> --- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.py >> +++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.py >> @@ -104,7 +104,7 @@ class ThreadControl(object): >> while len(self.running) > 0: >> time.sleep(0.1) >> if self.error: >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 print("subprocess not exit s= ucessfully") >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 print("subprocess not exit s= uccessfully") >> print(self.errorMsg) >>=20 >> def startTask(self): >> diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c >> b/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c >> index 357b8ace01..fddb46bbc3 100644 >> --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c >> +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c >> @@ -298,7 +298,7 @@ genDefFile( ) >> /* look in all lexclasses for the reg expr */ >>=20 >> /* MR10=C2=A0 Derek Pappas=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= = =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */ >> -/* MR10=C2=A0 =C2=A0 =C2=A0A #tokclass doesn't have associated regular= expressiones */ >> +/* MR10=C2=A0 =C2=A0 =C2=A0A #tokclass doesn't have associated regular= expressions */ >> /* MR10=C2=A0 =C2=A0 =C2=A0 =C2=A0 so don't warn user about it's omissi= on=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */ >>=20 >> p =3D (TermEntry *) hash_get(Tname, TokenString(i)); >> diff --git a/BaseTools/Source/C/VfrCompile/Pccts/h/err.h >> b/BaseTools/Source/C/VfrCompile/Pccts/h/err.h >> index b2b196bd75..435d48356d 100644 >> --- a/BaseTools/Source/C/VfrCompile/Pccts/h/err.h >> +++ b/BaseTools/Source/C/VfrCompile/Pccts/h/err.h >> @@ -649,7 +649,7 @@ _inf_zzgettok() >> /* allocate default size text,token and line arrays; >> * then, read all of the input reallocing the arrays as needed. >> * Once the number of total tokens is known, the LATEXT(i) array >> (zzinf_text) >> - * is allocated and it's pointers are set to the tokens in >> zzinf_text_buffer. >> + * is allocated and its pointers are set to the tokens in >> zzinf_text_buffer. >> */ >> void >> #ifdef __USE_PROTOS >> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py >> b/BaseTools/Source/Python/AutoGen/AutoGen.py >> index e8e09dc8a3..a2077c5516 100644 >> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py >> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py >> @@ -3030,7 +3030,7 @@ class ModuleAutoGen(AutoGen): >> IncPathList =3D [NormPath(Path, self.Macros) for Path in >> BuildOptIncludeRegEx.findall(FlagOption)] >> else: >> # >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # RVCT may spe= cify a list of directory seperated by >> commas >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # RVCT may spe= cify a list of directory separated by >> commas >> # >> IncPathList =3D [] >> for Path in BuildOptIncludeRegEx.findall(FlagOption): >> @@ -3994,7 +3994,7 @@ class ModuleAutoGen(AutoGen): >> # >> @cached_class_function >> def CreateMakeFile(self, CreateLibraryMakeFile=3DTrue, GenFfsList =3D [= ]): >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 # nest this function inside it's only call= er. >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 # nest this function inside its only calle= r. >> def CreateTimeStamp(): >> FileSet =3D {self.MetaFile.Path} >>=20 >> diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py >> b/BaseTools/Source/Python/BPDG/GenVpd.py >> index 887a0c4a1f..049c082f40 100644 >> --- a/BaseTools/Source/Python/BPDG/GenVpd.py >> +++ b/BaseTools/Source/Python/BPDG/GenVpd.py >> @@ -312,7 +312,7 @@ class GenVPD : >>=20 >> ## >> # Parser the input file which is generated by the build tool. Convert t= he >> value of each pcd's >> -=C2=A0 =C2=A0 # from string to it's real format. Also remove the usele= ss line in >> the input file. >> +=C2=A0 =C2=A0 # from string to its real format. Also remove the useles= s line in the >> input file. >> # >> def ParserInputFile (self): >> count =3D 0 >> @@ -483,7 +483,7 @@ class GenVPD : >> self.PcdFixedOffsetSizeList.sort(key=3Dlambda x: x.PcdBinOffset) >>=20 >> # >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 # Sort the un-fixed pcd's offset by it's s= ize. >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 # Sort the un-fixed pcd's offset by its si= ze. >> # >> self.PcdUnknownOffsetList.sort(key=3Dlambda x: x.PcdBinSize) >>=20 >> @@ -605,7 +605,7 @@ class GenVPD : >> # Usually it will not enter into this thunk, if so, means it overlapped= . >> else : >> EdkLogger.error("BPDG", BuildToolError.ATTRIBUTE_NOT_AVAILABLE, >> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "The offset value definition has >> overlapped at pcd: %s, it's offset is: %s, in file: %s line: %s" % \ >> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "The offset value definition has >> overlapped at pcd: %s, its offset is: %s, in file: %s line: %s" % \ >> (eachFixedPcd.PcdCName, eachFixedPcd.PcdOffset, >> eachFixedPcd.InputFileName, eachFixedPcd.Lineno), >> None) >> FixOffsetSizeListCount +=3D 1 >> diff --git a/BaseTools/Source/Python/Common/ToolDefClassObject.py >> b/BaseTools/Source/Python/Common/ToolDefClassObject.py >> index 5d692ea13c..4fa364942c 100644 >> --- a/BaseTools/Source/Python/Common/ToolDefClassObject.py >> +++ b/BaseTools/Source/Python/Common/ToolDefClassObject.py >> @@ -105,7 +105,7 @@ class ToolDefClassObject(object): >>=20 >> ## IncludeToolDefFile >> # >> -=C2=A0 =C2=A0 # Load target.txt file and parse it as if it's contents = were inside >> the main file >> +=C2=A0 =C2=A0 # Load target.txt file and parse it as if its contents w= ere inside >> the main file >> # >> # @param Filename:=C2=A0 Input value for full path of tools_def.txt >> # >> diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py >> b/BaseTools/Source/Python/UPT/Library/DataType.py >> index 88559bcc43..bd216786a5 100644 >> --- a/BaseTools/Source/Python/UPT/Library/DataType.py >> +++ b/BaseTools/Source/Python/UPT/Library/DataType.py >> @@ -210,7 +210,7 @@ ARCH_LIST =3D ["IA32", >> ## >> # PCD driver type list items >> # >> -PCD_DIRVER_TYPE_LIST =3D ["PEI_PCD_DRIVER", "DXE_PCD_DRIVER"] >> +PCD_DRIVER_TYPE_LIST =3D ["PEI_PCD_DRIVER", "DXE_PCD_DRIVER"] >>=20 >> ## >> # Boot Mode List Items >> diff --git a/BaseTools/Source/Python/UPT/Library/StringUtils.py >> b/BaseTools/Source/Python/UPT/Library/StringUtils.py >> index e43924fa6c..fbc5177caf 100644 >> --- a/BaseTools/Source/Python/UPT/Library/StringUtils.py >> +++ b/BaseTools/Source/Python/UPT/Library/StringUtils.py >> @@ -863,7 +863,7 @@ def ConvertNOTEQToNE(Expr): >> ## SplitPcdEntry >> # >> # Split an PCD entry string to Token.CName and PCD value and FFE. >> -# NOTE: PCD Value and FFE can contain "|" in it's expression. And in I= NF >> specification, have below rule. >> +# NOTE: PCD Value and FFE can contain "|" in its expression. And in IN= F >> specification, have below rule. >> # When using the characters "|" or "||" in an expression, the expressio= n >> must be encapsulated in >> # open "(" and close ")" parenthesis. >> # >> diff --git a/BaseTools/Source/Python/UPT/Logger/StringTable.py >> b/BaseTools/Source/Python/UPT/Logger/StringTable.py >> index 7782d26238..13c015844e 100644 >> --- a/BaseTools/Source/Python/UPT/Logger/StringTable.py >> +++ b/BaseTools/Source/Python/UPT/Logger/StringTable.py >> @@ -251,7 +251,7 @@ ERR_ASBUILD_PCD_SECTION_TYPE =3D _("The AsBuilt INF= file >> contains a PCD section ty >> ERR_ASBUILD_PATCHPCD_FORMAT_INVALID =3D _("The AsBuilt PatchPcd entry m= ust >> contain 3 elements: PcdName|Value|Offset") >> ERR_ASBUILD_PCDEX_FORMAT_INVALID =3D _("The AsBuilt PcdEx entry must co= ntain >> one element: PcdName") >> ERR_ASBUILD_PCD_VALUE_INVALID =3D \ >> -=C2=A0 =C2=A0 _("The AsBuilt PCD value %s is incorrect or not align wi= th it's datum >> type %s. " >> +=C2=A0 =C2=A0 _("The AsBuilt PCD value %s is incorrect or not align wi= th its datum >> type %s. " >> "It must be corrected before continuing.") >> ERR_ASBUILD_PCD_TOKENSPACE_GUID_VALUE_MISS =3D _("Package file value co= uld >> not be retrieved for %s.") >> ERR_ASBUILD_PCD_DECLARITION_MISS =3D _("PCD Declaration in DEC files co= uld >> not be found for: %s.") >> diff --git >> a/BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py >> b/BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py >> index 3383dc4b0f..fdba5db983 100644 >> --- a/BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py >> +++ b/BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py >> @@ -49,7 +49,7 @@ class InfBuildOptionsObject(InfSectionCommonDef): >> InfSectionCommonDef.__init__(self) >> ## SetBuildOptions function >> # >> -=C2=A0 =C2=A0 # For BuildOptionName, need to validate it's format >> +=C2=A0 =C2=A0 # For BuildOptionName, need to validate its format >> # For BuildOptionValue, just ignore it. >> # >> # @param=C2=A0 Arch=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Indicated which a= rch of build options belong to. >> -- >> 2.20.1 (Apple Git-117) >>=20 >>=20 >>=20 >=20 > --93nUA7717MGqY9U0Yyun Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable The attached patch looks fine.
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
On Thu, Jul 4, 2019 at 09:03 PM, Leif Lindholm wrote:
+Bob, Liming

On Wed, Jul 03, 2019 at 08:08:59AM -07= 00, Cœur wrote:
Fix various typos in BaseTools.

Contributed-under: = TianoCore Contribution Agreement 1.1
Signed-off-by: Coeur <coeur@gm= x.fr>
---
BaseTools/Conf/XMLSchema/DistributionPackage.xsd&nbs= p;         | 8 ++++----
.../plugins/EdkPlugins/edk= 2/model/doxygengen.py           | 2 +-
.= ../plugins/EdkPlugins/edk2/model/doxygengen_spec.py      | 2= +-
BaseTools/Source/C/Common/FirmwareVolumeBuffer.c    &nbs= p;     | 4 ++--
BaseTools/Source/C/Include/Common/BaseTypes.= h             | 2 +-
BaseTools/Sour= ce/C/Makefiles/NmakeSubdirs.py            &nb= sp; | 2 +-
BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c   = ;        | 2 +-
BaseTools/Source/C/VfrCompile/Pcct= s/h/err.h               | 2 +-
BaseTools/Source/Python/AutoGen/AutoGen.py        &nbs= p;       | 4 ++--
BaseTools/Source/Python/BPDG/GenVpd.p= y                    | 6 = +++---
BaseTools/Source/Python/Common/ToolDefClassObject.py  &nbs= p;   | 2 +-
BaseTools/Source/Python/UPT/Library/DataType.py =          | 2 +-
BaseTools/Source/Python/UPT/= Library/StringUtils.py        | 2 +-
BaseTools/Sou= rce/Python/UPT/Logger/StringTable.py         | 2 += -
.../Python/UPT/Object/Parser/InfBuildOptionObject.py    &n= bsp; | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
<= br />diff --git a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd b/BaseTo= ols/Conf/XMLSchema/DistributionPackage.xsd
index 7499c325c3..67be9c8f3= 2 100644
--- a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
+= ++ b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd
@@ -166,7 +166,7= @@ SPDX-License-Identifier: BSD-2-Clause-Patent
Package.
</xs= :documentation>
<xs:documentation xml:lang=3D"en-us">
-&= nbsp;             Each Distribution Package i= s uniquely identified by it's
+          &nbs= p;   Each Distribution Package is uniquely identified by its
GUID= and Version number.
</xs:documentation>
</xs:annotation= >
@@ -363,7 +363,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent<= br />Modules.
</xs:documentation>
<xs:documentation xml:= lang=3D"en-us">
-        Each package is unique= ly identified by it's GUID and Version number.
+      &= nbsp; Each package is uniquely identified by its GUID and Version number.Backward compatible releases of a package need only change the version = number, while non-backward
compatible changes require the GUID to chan= ge (resetting the version number to 1.0 is optional.)
</xs:document= ation>
@@ -1168,7 +1168,7 @@ SPDX-License-Identifier: BSD-2-Clause-= Patent
<xs:element name=3D"ModuleSurfaceArea">
<xs:annot= ation>
<xs:documentation xml:lang=3D"en-us">
-  &nb= sp;     Each module is uniquely identified by it's GUID and Versi= on number.
+        Each module is uniquely identi= fied by its GUID and Version number.
Backward compatible releases of a= module need only change the version number, while non-backward
compat= ible changes require the GUID to change (resetting the version number to 1.= 0 is optional.)
</xs:documentation>
@@ -3092,7 +3092,7 @@ S= PDX-License-Identifier: BSD-2-Clause-Patent
<xs:documentation xml:l= ang=3D"en-us">
The Patch PCD is a #define that is set at build time= , and that
can be modified within a binary file. Additional informatio= n, such as the offset location of the
-        &nb= sp;   value, along with it's length may need to be provided.
+&nb= sp;           value, along with its length may nee= d to be provided.
</xs:documentation>
</xs:annotation>= ;
</xs:enumeration>
diff --git a/BaseTools/Scripts/PackageD= ocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py b/BaseTools/Script= s/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
ind= ex d0274d6afd..89833043c6 100644
--- a/BaseTools/Scripts/PackageDocume= ntTools/plugins/EdkPlugins/edk2/model/doxygengen.py
+++ b/BaseTools/Sc= ripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py
@@ -792,7 +792,7 @@ class PackageDocumentAction(DoxygenAction):
Gener= ate page for a module/library.
@param infObj     INF fi= le object for module/library
@param configFile doxygen config file obj= ect
-        @param isLib      Whet= her this module is libary
+        @param isLib&nb= sp;     Whether this module is library

@param module d= oxygen page object
"""
diff --git a/BaseTools/Scripts/PackageDocu= mentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py b/BaseTools/Scri= pts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.pyindex 3ba4eed55e..e37938c466 100644
--- a/BaseTools/Scripts/Packag= eDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py
+++ b/= BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxyge= ngen_spec.py
@@ -793,7 +793,7 @@ class PackageDocumentAction(DoxygenAc= tion):
Generate page for a module/library.
@param infObj  &n= bsp;  INF file object for module/library
@param configFile doxyge= n config file object
-        @param isLib  &= nbsp;   Whether this module is libary
+       = ; @param isLib      Whether this module is library

@param module doxygen page object
"""
diff --git a/BaseTools/So= urce/C/Common/FirmwareVolumeBuffer.c b/BaseTools/Source/C/Common/FirmwareVo= lumeBuffer.c
index 6e1914be29..70741c8afc 100644
--- a/BaseTools/= Source/C/Common/FirmwareVolumeBuffer.c
+++ b/BaseTools/Source/C/Common= /FirmwareVolumeBuffer.c
@@ -937,7 +937,7 @@ Arguments:

Fv -= Address of the Fv in memory
Key - Should be 0 to get the first file.&= nbsp; After that, it should be
-        passed bac= k in without modifying it's contents to retrieve
+     =   passed back in without modifying its contents to retrieve
subs= equent files.
File - Output file pointer
File =3D=3D NULL - inval= id parameter
@@ -1323,7 +1323,7 @@ Arguments:
SectionsStart - Add= ress of the start of the FFS sections array
TotalSectionsSize - Total = size of all the sections
Key - Should be 0 to get the first section.&n= bsp; After that, it should be
-        passed back= in without modifying it's contents to retrieve
+      =   passed back in without modifying its contents to retrieve
subse= quent files.
Section - Output section pointer
(Section =3D=3D NUL= L) -> invalid parameter
diff --git a/BaseTools/Source/C/Include/Com= mon/BaseTypes.h b/BaseTools/Source/C/Include/Common/BaseTypes.h
index = 9844d1d514..31d0662085 100644
--- a/BaseTools/Source/C/Include/Common/= BaseTypes.h
+++ b/BaseTools/Source/C/Include/Common/BaseTypes.h
@= @ -151,7 +151,7 @@ typedef struct {

///
///  _CR - ret= urns a pointer to the structure
-///      from one of i= t's elements.
+///      from one of its elements.
= ///
#define _CR(Record, TYPE, Field)  ((TYPE *) ((CHAR8 *) (Recor= d) - (CHAR8 *) &(((TYPE *) 0)->Field)))

diff --git a/Base= Tools/Source/C/Makefiles/NmakeSubdirs.py b/BaseTools/Source/C/Makefiles/Nma= keSubdirs.py
index 30a481613e..356f5aca63 100644
--- a/BaseTools/= Source/C/Makefiles/NmakeSubdirs.py
+++ b/BaseTools/Source/C/Makefiles/= NmakeSubdirs.py
@@ -104,7 +104,7 @@ class ThreadControl(object):
= while len(self.running) > 0:
time.sleep(0.1)
if self.error:-            print("subprocess not exit su= cessfully")
+            print("subproce= ss not exit successfully")
print(self.errorMsg)

def startTa= sk(self):
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c= b/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c
index 357b8ace01..f= ddb46bbc3 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c=
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c
@@ -298,7 = +298,7 @@ genDefFile( )
/* look in all lexclasses for the reg expr */<= br />
/* MR10  Derek Pappas          &nb= sp;                     &= nbsp;               */
-/* MR10&nbs= p;    A #tokclass doesn't have associated regular expressiones */=
+/* MR10     A #tokclass doesn't have associated regul= ar expressions */
/* MR10        so don't warn use= r about it's omission               = ; */

p =3D (TermEntry *) hash_get(Tname, TokenString(i));
d= iff --git a/BaseTools/Source/C/VfrCompile/Pccts/h/err.h b/BaseTools/Source/= C/VfrCompile/Pccts/h/err.h
index b2b196bd75..435d48356d 100644
--= - a/BaseTools/Source/C/VfrCompile/Pccts/h/err.h
+++ b/BaseTools/Source= /C/VfrCompile/Pccts/h/err.h
@@ -649,7 +649,7 @@ _inf_zzgettok()
/= * allocate default size text,token and line arrays;
* then, read all o= f the input reallocing the arrays as needed.
* Once the number of tota= l tokens is known, the LATEXT(i) array (zzinf_text)
- * is allocated a= nd it's pointers are set to the tokens in zzinf_text_buffer.
+ * is al= located and its pointers are set to the tokens in zzinf_text_buffer.
*= /
void
#ifdef __USE_PROTOS
diff --git a/BaseTools/Source/Pyt= hon/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
in= dex e8e09dc8a3..a2077c5516 100644
--- a/BaseTools/Source/Python/AutoGe= n/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ = -3030,7 +3030,7 @@ class ModuleAutoGen(AutoGen):
IncPathList =3D [Norm= Path(Path, self.Macros) for Path in BuildOptIncludeRegEx.findall(FlagOption= )]
else:
#
-             =   # RVCT may specify a list of directory seperated by commas
+&n= bsp;               # RVCT may specify a = list of directory separated by commas
#
IncPathList =3D []
f= or Path in BuildOptIncludeRegEx.findall(FlagOption):
@@ -3994,7 +3994,= 7 @@ class ModuleAutoGen(AutoGen):
#
@cached_class_function
= def CreateMakeFile(self, CreateLibraryMakeFile=3DTrue, GenFfsList =3D []):<= br />-        # nest this function inside it's only cal= ler.
+        # nest this function inside its only= caller.
def CreateTimeStamp():
FileSet =3D {self.MetaFile.Path}<= br />
diff --git a/BaseTools/Source/Python/BPDG/GenVpd.py b/BaseTools/= Source/Python/BPDG/GenVpd.py
index 887a0c4a1f..049c082f40 100644
= --- a/BaseTools/Source/Python/BPDG/GenVpd.py
+++ b/BaseTools/Source/Py= thon/BPDG/GenVpd.py
@@ -312,7 +312,7 @@ class GenVPD :

### Parser the input file which is generated by the build tool. Convert t= he value of each pcd's
-    # from string to it's real forma= t. Also remove the useless line in the input file.
+    # fr= om string to its real format. Also remove the useless line in the input fil= e.
#
def ParserInputFile (self):
count =3D 0
@@ -483,7 = +483,7 @@ class GenVPD :
self.PcdFixedOffsetSizeList.sort(key=3Dlambda= x: x.PcdBinOffset)

#
-        # Sort t= he un-fixed pcd's offset by it's size.
+        # = Sort the un-fixed pcd's offset by its size.
#
self.PcdUnknownOffs= etList.sort(key=3Dlambda x: x.PcdBinSize)

@@ -605,7 +605,7 @@ cl= ass GenVPD :
# Usually it will not enter into this thunk, if so, means= it overlapped.
else :
EdkLogger.error("BPDG", BuildToolError.ATT= RIBUTE_NOT_AVAILABLE,
-             = ;                   "The offse= t value definition has overlapped at pcd: %s, it's offset is: %s, in file: = %s line: %s" % \
+              &nb= sp;                 "The offset val= ue definition has overlapped at pcd: %s, its offset is: %s, in file: %s lin= e: %s" % \
(eachFixedPcd.PcdCName, eachFixedPcd.PcdOffset, eachFixedPc= d.InputFileName, eachFixedPcd.Lineno),
None)
FixOffsetSizeListCou= nt +=3D 1
diff --git a/BaseTools/Source/Python/Common/ToolDefClassObje= ct.py b/BaseTools/Source/Python/Common/ToolDefClassObject.py
index 5d6= 92ea13c..4fa364942c 100644
--- a/BaseTools/Source/Python/Common/ToolDe= fClassObject.py
+++ b/BaseTools/Source/Python/Common/ToolDefClassObjec= t.py
@@ -105,7 +105,7 @@ class ToolDefClassObject(object):

= ## IncludeToolDefFile
#
-    # Load target.txt file and= parse it as if it's contents were inside the main file
+   = # Load target.txt file and parse it as if its contents were inside the mai= n file
#
# @param Filename:  Input value for full path of to= ols_def.txt
#
diff --git a/BaseTools/Source/Python/UPT/Library/Da= taType.py b/BaseTools/Source/Python/UPT/Library/DataType.py
index 8855= 9bcc43..bd216786a5 100644
--- a/BaseTools/Source/Python/UPT/Library/Da= taType.py
+++ b/BaseTools/Source/Python/UPT/Library/DataType.py
@= @ -210,7 +210,7 @@ ARCH_LIST =3D ["IA32",
##
# PCD driver type li= st items
#
-PCD_DIRVER_TYPE_LIST =3D ["PEI_PCD_DRIVER", "DXE_PCD_= DRIVER"]
+PCD_DRIVER_TYPE_LIST =3D ["PEI_PCD_DRIVER", "DXE_PCD_DRIVER"= ]

##
# Boot Mode List Items
diff --git a/BaseTools/Sou= rce/Python/UPT/Library/StringUtils.py b/BaseTools/Source/Python/UPT/Library= /StringUtils.py
index e43924fa6c..fbc5177caf 100644
--- a/BaseToo= ls/Source/Python/UPT/Library/StringUtils.py
+++ b/BaseTools/Source/Pyt= hon/UPT/Library/StringUtils.py
@@ -863,7 +863,7 @@ def ConvertNOTEQToN= E(Expr):
## SplitPcdEntry
#
# Split an PCD entry string to T= oken.CName and PCD value and FFE.
-# NOTE: PCD Value and FFE can conta= in "|" in it's expression. And in INF specification, have below rule.
= +# NOTE: PCD Value and FFE can contain "|" in its expression. And in INF sp= ecification, have below rule.
# When using the characters "|" or "||" = in an expression, the expression must be encapsulated in
# open "(" an= d close ")" parenthesis.
#
diff --git a/BaseTools/Source/Python/U= PT/Logger/StringTable.py b/BaseTools/Source/Python/UPT/Logger/StringTable.p= y
index 7782d26238..13c015844e 100644
--- a/BaseTools/Source/Pyth= on/UPT/Logger/StringTable.py
+++ b/BaseTools/Source/Python/UPT/Logger/= StringTable.py
@@ -251,7 +251,7 @@ ERR_ASBUILD_PCD_SECTION_TYPE =3D _(= "The AsBuilt INF file contains a PCD section ty
ERR_ASBUILD_PATCHPCD_F= ORMAT_INVALID =3D _("The AsBuilt PatchPcd entry must contain 3 elements: Pc= dName|Value|Offset")
ERR_ASBUILD_PCDEX_FORMAT_INVALID =3D _("The AsBui= lt PcdEx entry must contain one element: PcdName")
ERR_ASBUILD_PCD_VAL= UE_INVALID =3D \
-    _("The AsBuilt PCD value %s is incorre= ct or not align with it's datum type %s. "
+    _("The AsBui= lt PCD value %s is incorrect or not align with its datum type %s. "
"I= t must be corrected before continuing.")
ERR_ASBUILD_PCD_TOKENSPACE_GU= ID_VALUE_MISS =3D _("Package file value could not be retrieved for %s.")ERR_ASBUILD_PCD_DECLARITION_MISS =3D _("PCD Declaration in DEC files cou= ld not be found for: %s.")
diff --git a/BaseTools/Source/Python/UPT/Ob= ject/Parser/InfBuildOptionObject.py b/BaseTools/Source/Python/UPT/Object/Pa= rser/InfBuildOptionObject.py
index 3383dc4b0f..fdba5db983 100644
= --- a/BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py@@ -49,7 +49,7 @@ class InfBuildOptionsObject(InfSectionCommonDef):
InfSectionCommonDef.__init__(self)
## SetBuildOptions function
= #
-    # For BuildOptionName, need to validate it's format+    # For BuildOptionName, need to validate its format
= # For BuildOptionValue, just ignore it.
#
# @param  Arch&nbs= p;         Indicated which arch of build options belong= to.
--
2.20.1 (Apple Git-117)


--93nUA7717MGqY9U0Yyun--