Sync BaseTools Branch (version r2321) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / Common / DataType.py

diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index 62a23ea77323049758627da8aa453b58e08adaec..9a2556749ae63f2d7ebe24771db8febf58b244dd 100644 (file)
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -14,14 +14,15 @@
 # Common Definitions\r
 #\r
 TAB_SPLIT = '.'\r
-TAB_COMMENT_R8_START = '/*'\r
-TAB_COMMENT_R8_END = '*/'\r
-TAB_COMMENT_R8_SPLIT = '//'\r
+TAB_COMMENT_EDK_START = '/*'\r
+TAB_COMMENT_EDK_END = '*/'\r
+TAB_COMMENT_EDK_SPLIT = '//'\r
 TAB_COMMENT_SPLIT = '#'\r
 TAB_EQUAL_SPLIT = '='\r
 TAB_VALUE_SPLIT = '|'\r
 TAB_COMMA_SPLIT = ','\r
 TAB_SPACE_SPLIT = ' '\r
+TAB_SEMI_COLON_SPLIT = ';'\r
 TAB_SECTION_START = '['\r
 TAB_SECTION_END = ']'\r
 TAB_OPTION_START = '<'\r
@@ -301,16 +302,17 @@ TAB_INF_DEFINES_BINARY_MODULE = 'BINARY_MODULE'
 TAB_INF_DEFINES_LIBRARY_CLASS = 'LIBRARY_CLASS'\r
 TAB_INF_DEFINES_COMPONENT_TYPE = 'COMPONENT_TYPE'\r
 TAB_INF_DEFINES_MAKEFILE_NAME = 'MAKEFILE_NAME'\r
+TAB_INF_DEFINES_DPX_SOURCE = 'DPX_SOURCE'\r
 TAB_INF_DEFINES_BUILD_NUMBER = 'BUILD_NUMBER'\r
 TAB_INF_DEFINES_BUILD_TYPE = 'BUILD_TYPE'\r
 TAB_INF_DEFINES_FFS_EXT = 'FFS_EXT'\r
 TAB_INF_DEFINES_FV_EXT = 'FV_EXT'\r
 TAB_INF_DEFINES_SOURCE_FV = 'SOURCE_FV'\r
 TAB_INF_DEFINES_VERSION_NUMBER = 'VERSION_NUMBER'\r
-TAB_INF_DEFINES_VERSION = 'VERSION'          # for R8 inf, the same as VERSION_NUMBER\r
+TAB_INF_DEFINES_VERSION = 'VERSION'          # for Edk inf, the same as VERSION_NUMBER\r
 TAB_INF_DEFINES_VERSION_STRING = 'VERSION_STRING'\r
 TAB_INF_DEFINES_PCD_IS_DRIVER = 'PCD_IS_DRIVER'\r
-TAB_INF_DEFINES_TIANO_R8_FLASHMAP_H = 'TIANO_R8_FLASHMAP_H'\r
+TAB_INF_DEFINES_TIANO_EDK_FLASHMAP_H = 'TIANO_EDK_FLASHMAP_H'\r
 TAB_INF_DEFINES_ENTRY_POINT = 'ENTRY_POINT'\r
 TAB_INF_DEFINES_UNLOAD_IMAGE = 'UNLOAD_IMAGE'\r
 TAB_INF_DEFINES_CONSTRUCTOR = 'CONSTRUCTOR'\r
@@ -353,9 +355,10 @@ TAB_DSC_DEFINES_BUILD_NUMBER = 'BUILD_NUMBER'
 TAB_DSC_DEFINES_MAKEFILE_NAME = 'MAKEFILE_NAME'\r
 TAB_DSC_DEFINES_BS_BASE_ADDRESS = 'BsBaseAddress'\r
 TAB_DSC_DEFINES_RT_BASE_ADDRESS = 'RtBaseAddress'\r
+TAB_DSC_DEFINES_RFC_LANGUAGES = 'RFC_LANGUAGES'\r
+TAB_DSC_DEFINES_ISO_LANGUAGES = 'ISO_LANGUAGES'\r
 TAB_DSC_DEFINES_DEFINE = 'DEFINE'\r
 TAB_DSC_DEFINES_VPD_TOOL_GUID = 'VPD_TOOL_GUID'\r
-TAB_DSC_DEFINES_VPD_FILENAME = 'VPD_FILENAME'\r
 TAB_FIX_LOAD_TOP_MEMORY_ADDRESS = 'FIX_LOAD_TOP_MEMORY_ADDRESS'\r
 \r
 #\r
@@ -364,7 +367,6 @@ TAB_FIX_LOAD_TOP_MEMORY_ADDRESS = 'FIX_LOAD_TOP_MEMORY_ADDRESS'
 TAB_TAT_DEFINES_ACTIVE_PLATFORM = 'ACTIVE_PLATFORM'\r
 TAB_TAT_DEFINES_ACTIVE_MODULE = 'ACTIVE_MODULE'\r
 TAB_TAT_DEFINES_TOOL_CHAIN_CONF = 'TOOL_CHAIN_CONF'\r
-TAB_TAT_DEFINES_MULTIPLE_THREAD = 'MULTIPLE_THREAD'\r
 TAB_TAT_DEFINES_MAX_CONCURRENT_THREAD_NUMBER = 'MAX_CONCURRENT_THREAD_NUMBER'\r
 TAB_TAT_DEFINES_TARGET = 'TARGET'\r
 TAB_TAT_DEFINES_TOOL_CHAIN_TAG = 'TOOL_CHAIN_TAG'\r