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, 11 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py b/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py
index 098954d4ed..57bdcf96a3 100644
--- a/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py
+++ b/BaseTools/Source/Python/UPT/Object/POM/PackageObject.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to define a class object to describe a package

 #

-# 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,6 +21,7 @@ PackageObject
 from Object.POM.CommonObject import CommonPropertiesObject

 from Object.POM.CommonObject import IdentificationObject

 from Object.POM.CommonObject import CommonHeaderObject

+from Object.POM.CommonObject import BinaryHeaderObject

 from Library.Misc import Sdict

 

 ## StandardIncludeFileObject

@@ -44,10 +45,11 @@ class PackageIncludeFileObject(StandardIncludeFileObject):
 ##

 # PackageObject

 #

-class PackageObject(IdentificationObject, CommonHeaderObject):

+class PackageObject(IdentificationObject, CommonHeaderObject, BinaryHeaderObject):

     def __init__(self):

         IdentificationObject.__init__(self)

         CommonHeaderObject.__init__(self)

+        BinaryHeaderObject.__init__(self)

         #

         # LibraryClassObject

         #

@@ -85,8 +87,12 @@ class PackageObject(IdentificationObject, CommonHeaderObject):
         #

         self.PcdList = [] 

         #

-        # UserExtensionObject

+        # {(PcdTokenSpaceGuidCName, PcdErrroNumber): PcdErrorMessageList}

+        #

+        self.PcdErrorCommentDict = {}

         #

+        # UserExtensionObject

+        #        

         self.UserExtensionList = [] 

         #

         # MiscFileObject

@@ -104,6 +110,8 @@ class PackageObject(IdentificationObject, CommonHeaderObject):
         

         self.PcdChecks = []

         

+        self.UNIFlag = False

+        

     def SetLibraryClassList(self, LibraryClassList):

         self.LibraryClassList = LibraryClassList