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

1 files changed, 12 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
index 879f924c45..727164c2c2 100644
--- a/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
+++ b/BaseTools/Source/Python/UPT/Parser/InfSectionParser.py
@@ -1,7 +1,7 @@
 ## @file

 # This file contained the parser for sections in INF file 

 #

-# 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 

@@ -239,6 +239,7 @@ class InfSectionParser(InfDefinSectionParser,
         self.InfSmmDepexSection = InfDepexObject()

         self.InfBinariesSection = InfBinariesObject()

         self.InfHeader = InfHeaderObject()

+        self.InfBinaryHeader = InfHeaderObject()

         self.InfSpecialCommentSection = InfSpecialCommentObject()

 

         #

@@ -253,8 +254,16 @@ class InfSectionParser(InfDefinSectionParser,
     #

     # File Header content parser

     #    

-    def InfHeaderParser(self, Content, InfHeaderObject2, FileName):

-        (Abstract, Description, Copyright, License) = ParseHeaderCommentSection(Content, FileName)

+    def InfHeaderParser(self, Content, InfHeaderObject2, FileName, IsBinaryHeader = False):

+        if IsBinaryHeader:

+            (Abstract, Description, Copyright, License) = ParseHeaderCommentSection(Content, FileName, True)

+            if not Abstract or not Description or not Copyright or not License:

+                Logger.Error('Parser',

+                             FORMAT_INVALID,

+                             ST.ERR_INVALID_BINARYHEADER_FORMAT,

+                             File=FileName)

+        else:

+            (Abstract, Description, Copyright, License) = ParseHeaderCommentSection(Content, FileName)

         #

         # Not process file name now, for later usage.

         #