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>

3 files changed, 5 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index 2662132e51..5030df27b4 100644
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -40,6 +40,7 @@ TAB_UINT16 = 'UINT16'
 TAB_UINT32 = 'UINT32'

 TAB_UINT64 = 'UINT64'

 TAB_VOID = 'VOID*'

+TAB_GUID = 'GUID'

 

 TAB_PCD_CLEAN_NUMERIC_TYPES = {TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64}

 TAB_PCD_NUMERIC_TYPES = {TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, 'BOOLEAN'}

@@ -48,6 +49,7 @@ TAB_PCD_NUMERIC_TYPES_VOID = {TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64, 'BO
 TAB_EDK_SOURCE = '$(EDK_SOURCE)'

 TAB_EFI_SOURCE = '$(EFI_SOURCE)'

 TAB_WORKSPACE = '$(WORKSPACE)'

+TAB_FV_DIRECTORY = 'FV'

 

 TAB_ARCH_NULL = ''

 TAB_ARCH_COMMON = 'COMMON'

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 53504c110d..9fec10d2bb 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -951,7 +951,7 @@ class ValueExpressionEx(ValueExpression):
                             Size = 0

                             ValueStr = ''

                             TokenSpaceGuidName = ''

-                            if Item.startswith('GUID') and Item.endswith(')'):

+                            if Item.startswith(TAB_GUID) and Item.endswith(')'):

                                 try:

                                     TokenSpaceGuidName = re.search('GUID\((\w+)\)', Item).group(1)

                                 except:

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index f05ae39ebb..3d205197ab 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1219,7 +1219,7 @@ class tdict:
 

 def IsFieldValueAnArray (Value):

     Value = Value.strip()

-    if Value.startswith('GUID') and Value.endswith(')'):

+    if Value.startswith(TAB_GUID) and Value.endswith(')'):

         return True

     if Value.startswith('L"') and Value.endswith('"')  and len(list(Value[2:-1])) > 1:

         return True

@@ -1316,7 +1316,7 @@ def ParseFieldValue (Value):
         if Size > 8:

             raise BadExpression('Value (%s) Size larger than %d' % (Value, Size))

         return Value, 8

-    if Value.startswith('GUID') and Value.endswith(')'):

+    if Value.startswith(TAB_GUID) and Value.endswith(')'):

         Value = Value.split('(', 1)[1][:-1].strip()

         if Value[0] == '{' and Value[-1] == '}':

             TmpValue = GuidStructureStringToGuidString(Value)