BaseTools: Replace Binary File type strings with predefined constant

BINARY_FILE_TYPE_FW was 'FW'
BINARY_FILE_TYPE_GUID was 'GUID'
BINARY_FILE_TYPE_PREEFORM was 'PREEFORM'
BINARY_FILE_TYPE_UEFI_APP was 'UEFI_APP'
BINARY_FILE_TYPE_UNI_UI was 'UNI_UI'
BINARY_FILE_TYPE_UNI_VER was 'UNI_VER'
BINARY_FILE_TYPE_LIB was 'LIB'
BINARY_FILE_TYPE_PE32 was 'PE32'
BINARY_FILE_TYPE_PIC was 'PIC'
BINARY_FILE_TYPE_PEI_DEPEX was 'PEI_DEPEX'
BINARY_FILE_TYPE_DXE_DEPEX was 'DXE_DEPEX'
BINARY_FILE_TYPE_SMM_DEPEX was 'SMM_DEPEX'
BINARY_FILE_TYPE_TE was 'TE'
BINARY_FILE_TYPE_VER was 'VER'
BINARY_FILE_TYPE_UI was 'UI'
BINARY_FILE_TYPE_BIN was 'BIN'
BINARY_FILE_TYPE_FV was 'FV'

v2 - split apart FV and GUID types with different meanings.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index e68cd7de2c..608aad1148 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -208,7 +208,7 @@ def FindIncludeFiles(Source, IncludePathList, IncludeFiles):
             FileName = "Protocol/%(Key)s/%(Key)s.h" % {"Key" : Key}

         elif "PPI" in Type:

             FileName = "Ppi/%(Key)s/%(Key)s.h" % {"Key" : Key}

-        elif "GUID" in Type:

+        elif TAB_GUID in Type:

             FileName = "Guid/%(Key)s/%(Key)s.h" % {"Key" : Key}

         else:

             continue

@@ -1410,7 +1410,7 @@ class PredictionReport(object):
         if Wa.FdfProfile:

             for Fd in Wa.FdfProfile.FdDict:

                 for FdRegion in Wa.FdfProfile.FdDict[Fd].RegionList:

-                    if FdRegion.RegionType != "FV":

+                    if FdRegion.RegionType != BINARY_FILE_TYPE_FV:

                         continue

                     for FvName in FdRegion.RegionDataList:

                         if FvName in self._FvList:

@@ -1686,7 +1686,7 @@ class FdRegionReport(object):
         # If the input FdRegion is not a firmware volume,

         # we are done.

         #

-        if self.Type != "FV":

+        if self.Type != BINARY_FILE_TYPE_FV:

             return

 

         #

@@ -1780,7 +1780,7 @@ class FdRegionReport(object):
         FileWrite(File, "Type:               %s" % Type)

         FileWrite(File, "Base Address:       0x%X" % BaseAddress)

 

-        if self.Type == "FV":

+        if self.Type == BINARY_FILE_TYPE_FV:

             FvTotalSize = 0

             FvTakenSize = 0

             FvFreeSize  = 0

@@ -1843,7 +1843,7 @@ class FdRegionReport(object):
         if (len(self.FvList) > 0):

             for FvItem in self.FvList:

                 Info = self.FvInfo[FvItem]

-                self._GenerateReport(File, Info[0], "FV", Info[1], Info[2], FvItem)

+                self._GenerateReport(File, Info[0], TAB_FV_DIRECTORY, Info[1], Info[2], FvItem)

         else:

             self._GenerateReport(File, "FD Region", self.Type, self.BaseAddress, self.Size)

 

@@ -1869,7 +1869,7 @@ class FdReport(object):
         self.BaseAddress = Fd.BaseAddress

         self.Size = Fd.Size

         self.FdRegionList = [FdRegionReport(FdRegion, Wa) for FdRegion in Fd.RegionList]

-        self.FvPath = os.path.join(Wa.BuildDir, "FV")

+        self.FvPath = os.path.join(Wa.BuildDir, TAB_FV_DIRECTORY)

         self.VpdFilePath = os.path.join(self.FvPath, "%s.map" % Wa.Platform.VpdToolGuid)

         self.VPDBaseAddress = 0

         self.VPDSize = 0