BaseTools/UPT: Fix an issue of storing wrong PCD into XML file.

Fix an issue of storing wrong PCD into XML file to only store PcdEx for AsBuilt sections

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <hesheng.chen@intel.com>
Reviewed-by: Yingke Liu <yingke.d.liu@Intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16426 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
index fa5f5af0e2126e74bc795f2dd5425e63564900e9..22e9ef5fc0a302bf5ca97db19edfc775b3f33062 100644 (file)
--- a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
+++ b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py
@@ -940,7 +940,7 @@ class InfPomAlignment(ModuleObject):
                     HelpTextObj.SetString(CommentItem.GetHelpStringItem())\r
                     Pcd.SetHelpTextList(Pcd.GetHelpTextList() + [HelpTextObj])\r
                 AsBuildPatchPcdList.append(Pcd)\r
-            else:\r
+            elif PcdItem[0].upper() == DT.TAB_INF_PCD_EX.upper():\r
                 PcdItemObj = PcdItem[1]\r
                 Pcd = CommonObject.PcdObject()\r
                 Pcd.SetTokenSpaceGuidValue(PcdItemObj.GetTokenSpaceGuidValue())\r

diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
index d117468a17d868106c7cbc1ced7d144bc113777f..4dc1c7edab3d97d257552e92cc505081368f1d19 100644 (file)
--- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
+++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py
@@ -160,7 +160,7 @@ class BinaryFileXml(object):
 \r
         GuiVerElemList = []\r
         for LibGuidVer in LibGuidVerList:\r
-            if IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):\r
+            if LibGuidVer.GetLibGuid() and IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch):\r
                 GuiVerElem = \\r
                 CreateXmlElement('GUID', LibGuidVer.GetLibGuid(), [], [['Version', LibGuidVer.GetLibVersion()]])\r
                 GuiVerElemList.append(GuiVerElem)\r