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, 45 insertions, 38 deletions

diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index 9e141cabb4..d117468a17 100644
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -3,9 +3,9 @@
 #

 # 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 

-# distribution. The full text of the license may be found at 

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

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

+# distribution. The full text of the license may be found at

 # http://opensource.org/licenses/bsd-license.php

 #

 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

@@ -67,7 +67,7 @@ from Library.Misc import GetSplitValueList
 #    </Filename> {1,}

 #    <AsBuilt> ... </AsBuilt> {0,}

 #    </BinaryFile> {1,}

-#    

+#

 class BinaryFileXml(object):

     def __init__(self):

         self.FileNames = []

@@ -82,11 +82,16 @@ class BinaryFileXml(object):
             pass

         BinaryFile = BinaryFileObject()

         FilenameList = []

+        SupArchList = ['COMMON']

         for SubItem in XmlList(Item, '%s/Filename' % Key):

             Axml = FilenameXml()

             Bxml = Axml.FromXml(SubItem, 'Filename')

             FilenameList.append(Bxml)

         BinaryFile.SetFileNameList(FilenameList)

+        for FileName in FilenameList:

+            if FileName.GetSupArchList():

+                SupArchList = FileName.GetSupArchList()

+        BinaryFile.SetSupArchList(SupArchList)

         if GlobalData.gIS_BINARY_INF:

             AsBuiltList = []

             for AsBuiltItem in XmlList(Item, '%s/AsBuilt' % Key):

@@ -135,42 +140,44 @@ class BinaryFileXml(object):
             NodeList.append(Tmp.ToXml(Filename, 'Filename'))

             SupportArch = Filename.SupArchList

 

-        if GlobalData.gIS_BINARY_INF:

-            AsBuildList = BinaryFile.GetAsBuiltList()

-            PatchPcdValueList = AsBuildList.GetPatchPcdList()

-            PcdExList = AsBuildList.GetPcdExList()

-            LibGuidVerList = AsBuildList.GetLibraryInstancesList()

-            BuildFlagList = AsBuildList.GetBuildFlagsList()

-

-            AsBuiltNodeList = []

-

-            for Pcd in PatchPcdValueList:

-                if IsMatchArch(Pcd.SupArchList, SupportArch):

-                    Tmp = PcdEntryXml()

-                    AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PatchPcdValue'))

-

-            for Pcd in PcdExList:

-                if IsMatchArch(Pcd.SupArchList, SupportArch):

-                    Tmp = PcdEntryXml()

-                    AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PcdExValue'))

-

-            GuiVerElemList = []

-            for LibGuidVer in LibGuidVerList:

+        AsBuildList = BinaryFile.GetAsBuiltList()

+        PatchPcdValueList = AsBuildList.GetPatchPcdList()

+        PcdExList = AsBuildList.GetPcdExList()

+        LibGuidVerList = AsBuildList.GetLibraryInstancesList()

+        BuildFlagList = AsBuildList.GetBuildFlagsList()

+

+        AsBuiltNodeList = []

+

+        for Pcd in PatchPcdValueList:

+            if IsMatchArch(Pcd.SupArchList, SupportArch):

+                Tmp = PcdEntryXml()

+                AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PatchPcdValue'))

+

+        for Pcd in PcdExList:

+            if IsMatchArch(Pcd.SupArchList, SupportArch):

+                Tmp = PcdEntryXml()

+                AsBuiltNodeList.append(Tmp.ToXml4(Pcd, 'PcdExValue'))

+

+        GuiVerElemList = []

+        for LibGuidVer in LibGuidVerList:

+            if IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):

                 GuiVerElem = \

                 CreateXmlElement('GUID', LibGuidVer.GetLibGuid(), [], [['Version', LibGuidVer.GetLibVersion()]])

                 GuiVerElemList.append(GuiVerElem)

-            if len(GuiVerElemList) > 0:

-                LibGuidVerElem = CreateXmlElement('LibraryInstances', '', GuiVerElemList, [])

-                AsBuiltNodeList.append(LibGuidVerElem)

+        if len(GuiVerElemList) > 0:

+            LibGuidVerElem = CreateXmlElement('LibraryInstances', '', GuiVerElemList, [])

+            AsBuiltNodeList.append(LibGuidVerElem)

 

-            for BuildFlag in BuildFlagList:

-                Tmp = BuildFlagXml()

-                Elem = CreateXmlElement('BuildFlags', ''.join(BuildFlag), [], [])

-                AsBuiltNodeList.append(Elem)

+        for BuildFlag in BuildFlagList:

+            if IsMatchArch(BuildFlag.GetSupArchList(), SupportArch):

+                for Item in BuildFlag.GetAsBuildList():

+                    Tmp = BuildFlagXml()

+                    Elem = CreateXmlElement('BuildFlags', ''.join(Item), [], [])

+                    AsBuiltNodeList.append(Elem)

 

-            if len(AsBuiltNodeList) > 0:

-                Element = CreateXmlElement('AsBuilt', '', AsBuiltNodeList, [])

-                NodeList.append(Element)

+        if len(AsBuiltNodeList) > 0:

+            Element = CreateXmlElement('AsBuilt', '', AsBuiltNodeList, [])

+            NodeList.append(Element)

 

         Root = CreateXmlElement('%s' % Key, '', NodeList, [])

 

@@ -286,7 +293,7 @@ class ExternXml(object):
         for Item in self.HelpText:

             Str = Str + '\n\t' + str(Item)

         return Str

-##    

+##

 # DepexXml

 #

 class DepexXml(object):

@@ -654,7 +661,7 @@ class ModuleSurfaceAreaXml(object):
         else:

             Module.SetMiscFileList([])

 

-        #           

+        #

         # UserExtensions

         #

         for Item in XmlList(Item, '/ModuleSurfaceArea/UserExtensions'):

@@ -740,7 +747,7 @@ class ModuleSurfaceAreaXml(object):
            not XmlList(Item, '/ModuleSurfaceArea/PackageDependencies/Package'):

             Module.SetPackageDependencyList([None])

 

-        # 

+        #

         # Guid

         #

         for SubItem in XmlList(Item, '/ModuleSurfaceArea/Guids/GuidCName'):