From 1f0a062f8c5c46bffc911afda67e9f66e41af217 Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Tue, 25 Nov 2014 04:58:17 +0000 Subject: 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 Reviewed-by: Yingke Liu git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16426 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py | 2 +- BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py b/BaseTools/Source/Python/UPT/PomAdapter/InfPomAlignment.py index fa5f5af..22e9ef5 100644 --- 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()) Pcd.SetHelpTextList(Pcd.GetHelpTextList() + [HelpTextObj]) AsBuildPatchPcdList.append(Pcd) - else: + elif PcdItem[0].upper() == DT.TAB_INF_PCD_EX.upper(): PcdItemObj = PcdItem[1] Pcd = CommonObject.PcdObject() Pcd.SetTokenSpaceGuidValue(PcdItemObj.GetTokenSpaceGuidValue()) diff --git a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py index d117468..4dc1c7e 100644 --- a/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py +++ b/BaseTools/Source/Python/UPT/Xml/ModuleSurfaceAreaXml.py @@ -160,7 +160,7 @@ class BinaryFileXml(object): GuiVerElemList = [] for LibGuidVer in LibGuidVerList: - if IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch): + if LibGuidVer.GetLibGuid() and IsMatchArch(LibGuidVer.GetSupArchList(), SupportArch): GuiVerElem = \ CreateXmlElement('GUID', LibGuidVer.GetLibGuid(), [], [['Version', LibGuidVer.GetLibVersion()]]) GuiVerElemList.append(GuiVerElem) -- cgit v1.1