Sync BaseTool trunk (version r2640) into EDKII BaseTools.

Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Liu, Jiang A <jiang.a.liu@intel.com>


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

1 files changed, 16 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/UPT/Library/DataType.py b/BaseTools/Source/Python/UPT/Library/DataType.py
index de3c7092ad..4b30f3343e 100644
--- a/BaseTools/Source/Python/UPT/Library/DataType.py
+++ b/BaseTools/Source/Python/UPT/Library/DataType.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to define class for data type structure

 #

-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>

 #

 # This program and the accompanying materials are licensed and made available 

 # under the terms and conditions of the BSD License which accompanies this 

@@ -340,6 +340,7 @@ TAB_SLASH = '\\'
 TAB_BACK_SLASH = '/'

 TAB_SPECIAL_COMMENT = '##'

 TAB_HEADER_COMMENT = '@file'

+TAB_BINARY_HEADER_COMMENT = '@BinaryHeader'

 TAB_STAR = "*"

 

 TAB_EDK_SOURCE = '$(EDK_SOURCE)'

@@ -735,7 +736,12 @@ TAB_INF_PATCH_PCD = 'PatchPcd'
 TAB_INF_PCD = 'Pcd'

 TAB_INF_PCD_EX = 'PcdEx'

 TAB_INF_GUIDTYPE_VAR = 'Variable'

-

+TAB_INF_ABSTRACT = 'STR_MODULE_ABSTRACT'

+TAB_INF_DESCRIPTION = 'STR_MODULE_DESCRIPTION'

+TAB_INF_LICENSE = 'STR_MODULE_LICENSE'

+TAB_INF_BINARY_ABSTRACT = 'STR_MODULE_BINARY_ABSTRACT'

+TAB_INF_BINARY_DESCRIPTION = 'STR_MODULE_BINARY_DESCRIPTION'

+TAB_INF_BINARY_LICENSE = 'STR_MODULE_BINARY_LICENSE'

 #

 # Dec Definitions

 #

@@ -745,7 +751,12 @@ TAB_DEC_DEFINES_PACKAGE_NAME = 'PACKAGE_NAME'
 TAB_DEC_DEFINES_PACKAGE_GUID = 'PACKAGE_GUID'

 TAB_DEC_DEFINES_PACKAGE_VERSION = 'PACKAGE_VERSION'

 TAB_DEC_DEFINES_PKG_UNI_FILE    = 'PKG_UNI_FILE'

-

+TAB_DEC_PACKAGE_ABSTRACT = 'STR_PACKAGE_ABSTRACT'

+TAB_DEC_PACKAGE_DESCRIPTION = 'STR_PACKAGE_DESCRIPTION'

+TAB_DEC_PACKAGE_LICENSE = 'STR_PACKAGE_LICENSE'

+TAB_DEC_BINARY_ABSTRACT = 'STR_PACKAGE_BINARY_ABSTRACT'

+TAB_DEC_BINARY_DESCRIPTION = 'STR_PACKAGE_BINARY_DESCRIPTION'

+TAB_DEC_BINARY_LICENSE = 'STR_PACKAGE_ASBUILT_LICENSE'

 #

 # Dsc Definitions

 #

@@ -814,6 +825,8 @@ TAB_HEADER_ABSTRACT = 'Abstract'
 TAB_HEADER_DESCRIPTION = 'Description' 

 TAB_HEADER_COPYRIGHT = 'Copyright'

 TAB_HEADER_LICENSE = 'License'

+TAB_BINARY_HEADER_IDENTIFIER = 'BinaryHeader'

+TAB_BINARY_HEADER_USERID = 'TianoCore'

 #

 # Build database path

 #