BaseTools: Clean some coding style issues

This patch clean some coding style issues, majorly for space character.

(Sync patch r19080 from main trunk.)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19369 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 40 insertions, 40 deletions

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 38e55f3e07..722d8b7f45 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -78,13 +78,13 @@ gLineMaxLength = 120
 gEndOfLine = "\r\n"

 

 ## Tags for section start, end and separator

-gSectionStart = ">" + "=" * (gLineMaxLength-2) + "<"

-gSectionEnd = "<" + "=" * (gLineMaxLength-2) + ">" + "\n"

+gSectionStart = ">" + "=" * (gLineMaxLength - 2) + "<"

+gSectionEnd = "<" + "=" * (gLineMaxLength - 2) + ">" + "\n"

 gSectionSep = "=" * gLineMaxLength

 

 ## Tags for subsection start, end and separator

-gSubSectionStart = ">" + "-" * (gLineMaxLength-2) + "<"

-gSubSectionEnd = "<" + "-" * (gLineMaxLength-2) + ">"

+gSubSectionStart = ">" + "-" * (gLineMaxLength - 2) + "<"

+gSubSectionEnd = "<" + "-" * (gLineMaxLength - 2) + ">"

 gSubSectionSep = "-" * gLineMaxLength

 

 

@@ -233,7 +233,7 @@ class DepexParser(object):
     def __init__(self, Wa):

         self._GuidDb = {}

         for Pa in Wa.AutoGenObjectList:

-            for Package in Pa.PackageList:        

+            for Package in Pa.PackageList:

                 for Protocol in Package.Protocols:

                     GuidValue = GuidStructureStringToGuidString(Package.Protocols[Protocol])

                     self._GuidDb[GuidValue.upper()] = Protocol

@@ -265,8 +265,8 @@ class DepexParser(object):
                 GuidString = self._GuidDb.get(GuidValue, GuidValue)

                 Statement = "%s %s" % (Statement, GuidString)

             DepexStatement.append(Statement)

-            OpCode = DepexFile.read(1)     

-        

+            OpCode = DepexFile.read(1)

+

         return DepexStatement

     

 ##

@@ -361,7 +361,7 @@ class DepexReport(object):
     #

     def __init__(self, M):

         self.Depex = ""

-        self._DepexFileName = os.path.join(M.BuildDir, "OUTPUT", M.Module.BaseName + ".depex") 

+        self._DepexFileName = os.path.join(M.BuildDir, "OUTPUT", M.Module.BaseName + ".depex")

         ModuleType = M.ModuleType

         if not ModuleType:

             ModuleType = gComponentType2ModuleType.get(M.ComponentType, "")

@@ -536,7 +536,7 @@ class ModuleReport(object):
             # If a module complies to PI 1.1, promote Module type to "SMM_DRIVER"

             #

             if ModuleType == "DXE_SMM_DRIVER":

-                PiSpec =  M.Module.Specification.get("PI_SPECIFICATION_VERSION", "0x00010000")

+                PiSpec = M.Module.Specification.get("PI_SPECIFICATION_VERSION", "0x00010000")

                 if int(PiSpec, 0) >= 0x0001000A:

                     ModuleType = "SMM_DRIVER"

             self.DriverType = gDriverTypeMap.get(ModuleType, "0x2 (FREE_FORM)")

@@ -813,20 +813,20 @@ class PcdReport(object):
                     # Report PCD item according to their override relationship

                     #

                     if DecMatch and InfMatch:

-                        FileWrite(File, '    %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue.strip()))

+                        FileWrite(File, '    %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '(' + Pcd.DatumType + ')', PcdValue.strip()))

                     else:

                         if DscMatch:

                             if (Pcd.TokenCName, Key) in self.FdfPcdSet:

-                                FileWrite(File, ' *F %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue.strip()))

+                                FileWrite(File, ' *F %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '(' + Pcd.DatumType + ')', PcdValue.strip()))

                             else:

-                                FileWrite(File, ' *P %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue.strip()))

+                                FileWrite(File, ' *P %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '(' + Pcd.DatumType + ')', PcdValue.strip()))

                         else:

-                            FileWrite(File, ' *M %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '('+Pcd.DatumType+')', PcdValue.strip()))

-                    

+                            FileWrite(File, ' *M %-*s: %6s %10s = %-22s' % (self.MaxLen, Pcd.TokenCName, TypeName, '(' + Pcd.DatumType + ')', PcdValue.strip()))

+

                     if TypeName in ('DYNHII', 'DEXHII', 'DYNVPD', 'DEXVPD'):

                         for SkuInfo in Pcd.SkuInfoList.values():

                             if TypeName in ('DYNHII', 'DEXHII'):

-                                FileWrite(File, '%*s: %s: %s' % (self.MaxLen + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset))        

+                                FileWrite(File, '%*s: %s: %s' % (self.MaxLen + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset))

                             else:

                                 FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.VpdOffset))

                                

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 6d83ac9701..3cd385d69d 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -210,7 +210,7 @@ def NormFile(FilePath, Workspace):
 

     # check if the file path exists or not

     if not os.path.isfile(FileFullPath):

-        EdkLogger.error("build", FILE_NOT_FOUND, ExtraData="\t%s (Please give file in absolute path or relative to WORKSPACE)"  % FileFullPath)

+        EdkLogger.error("build", FILE_NOT_FOUND, ExtraData="\t%s (Please give file in absolute path or relative to WORKSPACE)" % FileFullPath)

 

     # remove workspace directory from the beginning part of the file path

     if Workspace[-1] in ["\\", "/"]:

@@ -1122,13 +1122,13 @@ class Build():
                 # Update Image to new BaseAddress by GenFw tool

                 #

                 LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)

-                LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleDebugImage],  ModuleInfo.DebugDir)

+                LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)

             else:

                 #

                 # Set new address to the section header only for SMM driver.

                 #

                 LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)

-                LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleDebugImage],  ModuleInfo.DebugDir)

+                LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)

             #

             # Collect funtion address from Map file

             #

@@ -1136,7 +1136,7 @@ class Build():
             FunctionList = []

             if os.path.exists(ImageMapTable):

                 OrigImageBaseAddress = 0

-                ImageMap = open (ImageMapTable, 'r')

+                ImageMap = open(ImageMapTable, 'r')

                 for LinStr in ImageMap:

                     if len (LinStr.strip()) == 0:

                         continue

@@ -1149,7 +1149,7 @@ class Build():
 

                     StrList = LinStr.split()

                     if len (StrList) > 4:

-                        if StrList[3] == 'f' or StrList[3] =='F':

+                        if StrList[3] == 'f' or StrList[3] == 'F':

                             Name = StrList[1]

                             RelativeAddress = int (StrList[2], 16) - OrigImageBaseAddress

                             FunctionList.append ((Name, RelativeAddress))

@@ -1273,7 +1273,7 @@ class Build():
                     if not ImageClass.IsValid:

                         EdkLogger.error("build", FILE_PARSE_FAILURE, ExtraData=ImageClass.ErrorInfo)

                     ImageInfo = PeImageInfo(Module.Name, Module.Guid, Module.Arch, Module.OutputDir, Module.DebugDir, ImageClass)

-                    if Module.ModuleType in ['PEI_CORE', 'PEIM', 'COMBINED_PEIM_DRIVER','PIC_PEIM', 'RELOCATABLE_PEIM', 'DXE_CORE']:

+                    if Module.ModuleType in ['PEI_CORE', 'PEIM', 'COMBINED_PEIM_DRIVER', 'PIC_PEIM', 'RELOCATABLE_PEIM', 'DXE_CORE']:

                         PeiModuleList[Module.MetaFile] = ImageInfo

                         PeiSize += ImageInfo.Image.Size

                     elif Module.ModuleType in ['BS_DRIVER', 'DXE_DRIVER', 'UEFI_DRIVER']:

@@ -1354,21 +1354,21 @@ class Build():
             for PcdInfo in PcdTable:

                 ReturnValue = 0

                 if PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE:

-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE_DATA_TYPE, str (PeiSize/0x1000))

+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE_DATA_TYPE, str (PeiSize / 0x1000))

                 elif PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE:

-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE_DATA_TYPE, str (BtSize/0x1000))

+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE_DATA_TYPE, str (BtSize / 0x1000))

                 elif PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE:

-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE_DATA_TYPE, str (RtSize/0x1000))

+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE_DATA_TYPE, str (RtSize / 0x1000))

                 elif PcdInfo[0] == TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE and len (SmmModuleList) > 0:

-                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE_DATA_TYPE, str (SmmSize/0x1000))

+                    ReturnValue, ErrorInfo = PatchBinaryFile (EfiImage, PcdInfo[1], TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE_DATA_TYPE, str (SmmSize / 0x1000))

                 if ReturnValue != 0:

                     EdkLogger.error("build", PARAMETER_INVALID, "Patch PCD value failed", ExtraData=ErrorInfo)

 

-        MapBuffer.write('PEI_CODE_PAGE_NUMBER      = 0x%x\n' % (PeiSize/0x1000))

-        MapBuffer.write('BOOT_CODE_PAGE_NUMBER     = 0x%x\n' % (BtSize/0x1000))

-        MapBuffer.write('RUNTIME_CODE_PAGE_NUMBER  = 0x%x\n' % (RtSize/0x1000))

+        MapBuffer.write('PEI_CODE_PAGE_NUMBER      = 0x%x\n' % (PeiSize / 0x1000))

+        MapBuffer.write('BOOT_CODE_PAGE_NUMBER     = 0x%x\n' % (BtSize / 0x1000))

+        MapBuffer.write('RUNTIME_CODE_PAGE_NUMBER  = 0x%x\n' % (RtSize / 0x1000))

         if len (SmmModuleList) > 0:

-            MapBuffer.write('SMM_CODE_PAGE_NUMBER      = 0x%x\n' % (SmmSize/0x1000))

+            MapBuffer.write('SMM_CODE_PAGE_NUMBER      = 0x%x\n' % (SmmSize / 0x1000))

 

         PeiBaseAddr = TopMemoryAddress - RtSize - BtSize

         BtBaseAddr  = TopMemoryAddress - RtSize

@@ -1377,7 +1377,7 @@ class Build():
         self._RebaseModule (MapBuffer, PeiBaseAddr, PeiModuleList, TopMemoryAddress == 0)

         self._RebaseModule (MapBuffer, BtBaseAddr, BtModuleList, TopMemoryAddress == 0)

         self._RebaseModule (MapBuffer, RtBaseAddr, RtModuleList, TopMemoryAddress == 0)

-        self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset = False, ModeIsSmm = True)

+        self._RebaseModule (MapBuffer, 0x1000, SmmModuleList, AddrIsOffset=False, ModeIsSmm=True)

         MapBuffer.write('\n\n')

         sys.stdout.write ("\n")

         sys.stdout.flush()

@@ -1395,7 +1395,7 @@ class Build():
         SaveFileOnChange(MapFilePath, MapBuffer.getvalue(), False)

         MapBuffer.close()

         if self.LoadFixAddress != 0:

-            sys.stdout.write ("\nLoad Module At Fix Address Map file can be found at %s\n" %(MapFilePath))

+            sys.stdout.write ("\nLoad Module At Fix Address Map file can be found at %s\n" % (MapFilePath))

         sys.stdout.flush()

 

     ## Build active platform for different build targets and different tool chains

@@ -1529,7 +1529,7 @@ class Build():
                                 BUILD_ERROR,

                                 "Module for [%s] is not a component of active platform."\

                                 " Please make sure that the ARCH and inf file path are"\

-                                " given in the same as in [%s]" %\

+                                " given in the same as in [%s]" % \

                                     (', '.join(Wa.ArchList), self.PlatformFile),

                                 ExtraData=self.ModuleFile

                                 )

@@ -1874,8 +1874,8 @@ def SingleCheckCallback(option, opt_str, value, parser):
 #   @retval Args  Target of build command

 #

 def MyOptionParser():

-    Parser = OptionParser(description=__copyright__,version=__version__,prog="build.exe",usage="%prog [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run]")

-    Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32','X64','IPF','EBC','ARM', 'AARCH64'], dest="TargetArch",

+    Parser = OptionParser(description=__copyright__, version=__version__, prog="build.exe", usage="%prog [options] [all|fds|genc|genmake|clean|cleanall|cleanlib|modules|libraries|run]")

+    Parser.add_option("-a", "--arch", action="append", type="choice", choices=['IA32', 'X64', 'IPF', 'EBC', 'ARM', 'AARCH64'], dest="TargetArch",

         help="ARCHS is one of list: IA32, X64, IPF, ARM, AARCH64 or EBC, which overrides target.txt's TARGET_ARCH definition. To specify more archs, please repeat this option.")

     Parser.add_option("-p", "--platform", action="callback", type="string", dest="PlatformFile", callback=SingleCheckCallback,

         help="Build the platform specified by the DSC file name argument, overriding target.txt's ACTIVE_PLATFORM definition.")

@@ -1917,7 +1917,7 @@ def MyOptionParser():
     Parser.add_option("-D", "--define", action="append", type="string", dest="Macros", help="Macro: \"Name [= Value]\".")

 

     Parser.add_option("-y", "--report-file", action="store", dest="ReportFile", help="Create/overwrite the report to the specified filename.")

-    Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDRESS', 'EXECUTION_ORDER'], dest="ReportType", default=[],

+    Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD', 'LIBRARY', 'FLASH', 'DEPEX', 'BUILD_FLAGS', 'FIXED_ADDRESS', 'EXECUTION_ORDER'], dest="ReportType", default=[],

         help="Flags that control the type of build report to generate.  Must be one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, EXECUTION_ORDER].  "\

              "To specify more than one flag, repeat this option on the command line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS]")

     Parser.add_option("-F", "--flag", action="store", type="string", dest="Flag",

@@ -1929,7 +1929,7 @@ def MyOptionParser():
     Parser.add_option("--check-usage", action="store_true", dest="CheckUsage", default=False, help="Check usage content of entries listed in INF file.")

     Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")

 

-    (Opt, Args)=Parser.parse_args()

+    (Opt, Args) = Parser.parse_args()

     return (Opt, Args)

 

 ## Tool entrance method

@@ -1985,13 +1985,13 @@ def Main():
             Target = "all"

         elif len(Target) >= 2:

             EdkLogger.error("build", OPTION_NOT_SUPPORTED, "More than one targets are not supported.",

-                            ExtraData="Please select one of: %s" %(' '.join(gSupportedTarget)))

+                            ExtraData="Please select one of: %s" % (' '.join(gSupportedTarget)))

         else:

             Target = Target[0].lower()

 

         if Target not in gSupportedTarget:

             EdkLogger.error("build", OPTION_NOT_SUPPORTED, "Not supported target [%s]." % Target,

-                            ExtraData="Please select one of: %s" %(' '.join(gSupportedTarget)))

+                            ExtraData="Please select one of: %s" % (' '.join(gSupportedTarget)))

 

         #

         # Check environment variable: EDK_TOOLS_PATH, WORKSPACE, PATH

@@ -2069,7 +2069,7 @@ def Main():
         if Option != None and Option.debug != None:

             EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())

         else:

-            EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError = False)

+            EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)

         ReturnCode = FORMAT_INVALID

     except KeyboardInterrupt:

         ReturnCode = ABORT_ERROR

@@ -2110,7 +2110,7 @@ def Main():
     BuildDuration = time.gmtime(int(round(FinishTime - StartTime)))

     BuildDurationStr = ""

     if BuildDuration.tm_yday > 1:

-        BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration) + ", %d day(s)"%(BuildDuration.tm_yday - 1)

+        BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration) + ", %d day(s)" % (BuildDuration.tm_yday - 1)

     else:

         BuildDurationStr = time.strftime("%H:%M:%S", BuildDuration)

     if MyBuild != None: