Re: [Patch] BaseTools: Fix incorrect formatting of GenFds command dictionary

["Gao, Liming" <liming.gao@intel.com>]

Please update the patch to remove EFI_SOURCE. This has been removed from edk2 master. 

Thanks
Liming
>-----Original Message-----
>From: Felix Polyudov [mailto:felixp@ami.com]
>Sent: Wednesday, January 16, 2019 7:33 AM
>To: edk2-devel@lists.01.org
>Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
><liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
>Subject: [Patch] BaseTools: Fix incorrect formatting of GenFds command
>dictionary
>
>The issue is introduced by commit
>b3497bad1221704a5dbc5da0b10f42625f1ad2ed.
>GenFdsCommand returned dictionary with elements that
>are not compatible with GenFdsApi.
>As a result the following options were not processed by GenFdsApi:
>-v, -q, -d, --genfds-multi-thread, --ignore-sources
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Felix Polyudov <felixp@ami.com>
>---
> BaseTools/Source/Python/AutoGen/AutoGen.py | 54
>+++++++++++++++++++++++++++++-
> 1 file changed, 53 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
>b/BaseTools/Source/Python/AutoGen/AutoGen.py
>index cfe2d29..db3717d 100644
>--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
>+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
>@@ -3,6 +3,7 @@
> #
> # Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>
> # Copyright (c) 2018, Hewlett Packard Enterprise Development, L.P.<BR>
>+# Copyright (c) 2019, American Megatrends, Inc. All rights reserved.<BR>
> #
> # This program and the accompanying materials
> # are licensed and made available under the terms and conditions of the BSD
>License
>@@ -935,7 +936,58 @@ class WorkspaceAutoGen(AutoGen):
>
>     @property
>     def GenFdsCommandDict(self):
>-        return GenMake.TopLevelMakefile(self)._TemplateDict
>+        FdsCommandDict = {}
>+        LogLevel = EdkLogger.GetLevel()
>+        if LogLevel == EdkLogger.VERBOSE:
>+            FdsCommandDict["verbose"] = True
>+        elif LogLevel <= EdkLogger.DEBUG_9:
>+            FdsCommandDict["debug"] = LogLevel - 1
>+        elif LogLevel == EdkLogger.QUIET:
>+            FdsCommandDict["quiet"] = True
>+
>+        if GlobalData.gEnableGenfdsMultiThread:
>+            FdsCommandDict["GenfdsMultiThread"] = True
>+        if GlobalData.gIgnoreSource:
>+            FdsCommandDict["IgnoreSources"] = True
>+
>+        FdsCommandDict["OptionPcd"] = []
>+        for pcd in GlobalData.BuildOptionPcd:
>+            if pcd[2]:
>+                pcdname = '.'.join(pcd[0:3])
>+            else:
>+                pcdname = '.'.join(pcd[0:2])
>+            if pcd[3].startswith('{'):
>+                FdsCommandDict["OptionPcd"].append(pcdname + '=' + 'H' + '"' +
>pcd[3] + '"')
>+            else:
>+                FdsCommandDict["OptionPcd"].append(pcdname + '=' + pcd[3])
>+
>+        MacroList = []
>+        # macros passed to GenFds
>+        MacroList.append('"%s=%s"' % ("EFI_SOURCE",
>GlobalData.gEfiSource.replace('\\', '\\\\')))
>+        MacroDict = {}
>+        MacroDict.update(GlobalData.gGlobalDefines)
>+        MacroDict.update(GlobalData.gCommandLineDefines)
>+        MacroDict.pop("EFI_SOURCE", "dummy")
>+        for MacroName in MacroDict:
>+            if MacroDict[MacroName] != "":
>+                MacroList.append('"%s=%s"' % (MacroName,
>MacroDict[MacroName].replace('\\', '\\\\')))
>+            else:
>+                MacroList.append('"%s"' % MacroName)
>+        FdsCommandDict["macro"] = MacroList
>+
>+        FdsCommandDict["fdf_file"] = [self.FdfFile]
>+        FdsCommandDict["build_target"] = self.BuildTarget
>+        FdsCommandDict["toolchain_tag"] = self.ToolChain
>+        FdsCommandDict["active_platform"] = str(self)
>+
>+        FdsCommandDict["conf_directory"] = GlobalData.gConfDirectory
>+        FdsCommandDict["build_architecture_list"] = ','.join(self.ArchList)
>+        FdsCommandDict["platform_build_directory"] = self.BuildDir
>+
>+        FdsCommandDict["fd"] = self.FdTargetList
>+        FdsCommandDict["fv"] = self.FvTargetList
>+        FdsCommandDict["cap"] = self.CapTargetList
>+        return FdsCommandDict
>
>     ## Create makefile for the platform and modules in it
>     #
>--
>2.10.0.windows.1
>
>
>
>Please consider the environment before printing this email.
>
>The information contained in this message may be confidential and
>proprietary to American Megatrends, Inc.  This communication is intended to
>be read only by the individual or entity to whom it is addressed or by their
>designee. If the reader of this message is not the intended recipient, you are
>on notice that any distribution of this message, in any form, is strictly
>prohibited.  Please promptly notify the sender by reply e-mail or by telephone
>at 770-246-8600, and then delete or destroy all copies of the transmission.