This patch is going to:

1.	Add a recovery mode for UPT failure
2.	Add UNI file support
3.	Add binary file header support
4.	Add support for PCD error message
5.	Add support for replace
6.	Format generated INF/DEC files
7.	Update dependency check
8.	Other minor fixes


Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>

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

2 files changed, 14 insertions, 13 deletions

diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
index 72a909db0e..42a2ba3a6b 100644
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
@@ -1,7 +1,7 @@
 ## @file

 # This file contain unit test for CommentParsing

 #

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

+# Copyright (c) 2011 - 2014, 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 

@@ -30,7 +30,8 @@ from Object.POM.ModuleObject import HobObject
                                

 from Library.String import GetSplitValueList

 from Library.DataType import TAB_SPACE_SPLIT

-from Library.DataType import LANGUAGE_EN_US

+from Library.DataType import TAB_LANGUAGE_EN_US

+from Library.DataType import TAB_LANGUAGE_ENG

 from Library.DataType import ITEM_UNDEFINED

 from Library.DataType import TAB_INF_FEATURE_PCD

 from Library import GlobalData

@@ -52,7 +53,7 @@ class _GetHelpStrTest(unittest.TestCase):
     def testNormalCase1(self):

         HelpStr = 'Hello world'

         HelpTextObj = TextObject()

-        HelpTextObj.SetLang(LANGUAGE_EN_US)

+        HelpTextObj.SetLang(TAB_LANGUAGE_EN_US)

         HelpTextObj.SetString(HelpStr)

         

         HelpTextList = [HelpTextObj]

@@ -65,14 +66,14 @@ class _GetHelpStrTest(unittest.TestCase):
     def testNormalCase2(self):

         HelpStr = 'Hello world'

         HelpTextObj = TextObject()

-        HelpTextObj.SetLang('eng')

+        HelpTextObj.SetLang(TAB_LANGUAGE_ENG)

         HelpTextObj.SetString(HelpStr)

         

         HelpTextList = [HelpTextObj]

 

         ExpectedStr = 'Hello world1'

         HelpTextObj = TextObject()

-        HelpTextObj.SetLang(LANGUAGE_EN_US)

+        HelpTextObj.SetLang(TAB_LANGUAGE_EN_US)

         HelpTextObj.SetString(ExpectedStr)        

         

         HelpTextList.append(HelpTextObj)

@@ -93,7 +94,7 @@ class _GetHelpStrTest(unittest.TestCase):
 

         ExpectedStr = 'Hello world1'

         HelpTextObj = TextObject()

-        HelpTextObj.SetLang('eng')

+        HelpTextObj.SetLang(TAB_LANGUAGE_ENG)

         HelpTextObj.SetString(ExpectedStr)        

         

         HelpTextList.append(HelpTextObj)

@@ -108,7 +109,7 @@ class _GetHelpStrTest(unittest.TestCase):
 

         ExpectedStr = 'Hello world1'

         HelpTextObj = TextObject()

-        HelpTextObj.SetLang('eng')

+        HelpTextObj.SetLang(TAB_LANGUAGE_ENG)

         HelpTextObj.SetString(ExpectedStr)        

         HelpTextList = [HelpTextObj]

       

@@ -128,7 +129,7 @@ class _GetHelpStrTest(unittest.TestCase):
 

         ExpectedStr = 'Hello world1'

         HelpTextObj = TextObject()

-        HelpTextObj.SetLang(LANGUAGE_EN_US)

+        HelpTextObj.SetLang(TAB_LANGUAGE_EN_US)

         HelpTextObj.SetString(ExpectedStr)        

         HelpTextList = [HelpTextObj]

       

diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
index 3ed3345c6d..a114ff22a7 100644
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
@@ -1,7 +1,7 @@
 ## @file

 # This file contain unit test for CommentParsing

 #

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

+# Copyright (c) 2011 - 2014, 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 

@@ -21,7 +21,7 @@ from Library.CommentParsing import ParseHeaderCommentSection, \
 from Library.CommentParsing import _IsCopyrightLine

 from Library.String import GetSplitValueList

 from Library.DataType import TAB_SPACE_SPLIT

-from Library.DataType import LANGUAGE_EN_US

+from Library.DataType import TAB_LANGUAGE_EN_US

 

 #

 # Test ParseHeaderCommentSection

@@ -467,7 +467,7 @@ class ParseGenericCommentTest(unittest.TestCase):
         HelptxtObj = ParseGenericComment(TestCommentLinesList, 'testNormalCase1')

         self.failIf(not HelptxtObj)

         self.assertEqual(HelptxtObj.GetString(), 'hello world')

-        self.assertEqual(HelptxtObj.GetLang(), LANGUAGE_EN_US)

+        self.assertEqual(HelptxtObj.GetLang(), TAB_LANGUAGE_EN_US)

 

     #

     # Normal case2: multiple lines of comment

@@ -488,7 +488,7 @@ class ParseGenericCommentTest(unittest.TestCase):
         self.failIf(not HelptxtObj)

         self.assertEqual(HelptxtObj.GetString(), 

                          'hello world\n' + 'second line')

-        self.assertEqual(HelptxtObj.GetLang(), LANGUAGE_EN_US)

+        self.assertEqual(HelptxtObj.GetLang(), TAB_LANGUAGE_EN_US)

 

     #

     # Normal case3: multiple lines of comment, non comment lines will be skipped

@@ -509,7 +509,7 @@ class ParseGenericCommentTest(unittest.TestCase):
         self.failIf(not HelptxtObj)

         self.assertEqual(HelptxtObj.GetString(), 

                          'hello world\n\n')

-        self.assertEqual(HelptxtObj.GetLang(), LANGUAGE_EN_US)

+        self.assertEqual(HelptxtObj.GetLang(), TAB_LANGUAGE_EN_US)

 

 #

 # Test ParseDecPcdGenericComment