Reviewed-by: Yuwei Chen<yuwei.c...@intel.com> > -----Original Message----- > From: Kinney, Michael D <michael.d.kin...@intel.com> > Sent: Saturday, April 10, 2021 5:49 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C <bob.c.f...@intel.com>; Liming Gao > <gaolim...@byosoft.com.cn>; Chen, Christine <yuwei.c...@intel.com> > Subject: [Patch 1/1] BaseTools/PlatformAutoGen: MAKE_FLAGS and > MAKE_PATH fixes > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3312 > > Update parsing of MAKE_FLAGS in DSC [BuildOptions] sections to split the > flags into a list to be compatible with running the make command using > Popen(). Parsing MAKE_FLAGS from tools_def.txt already uses _SplitOption(). > This change uses the same _SplitOption() method for MAKE_FLAGS from a > DSC [BuildOptions] section. > > Also update the parsing of MAKE_PATH to support MAKE_PATH from > tools_def.txt or the DSC [BuildOptions] section. MAKE_PATH in DSC > [BuildOptions] section is higher priority than MAKE_PATH in tools_def.txt. > > Cc: Bob Feng <bob.c.f...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > Cc: Yuwei Chen <yuwei.c...@intel.com> > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > --- > .../Source/Python/AutoGen/PlatformAutoGen.py | 36 +++++++++++-------- > 1 file changed, 21 insertions(+), 15 deletions(-) > > diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py > b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py > index 7d8e7b3c7cc1..c16f2e4cd8b7 100644 > --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py > @@ -1,7 +1,7 @@ > ## @file > # Create makefile for MS nmake and GNU make # -# Copyright (c) 2019, Intel > Corporation. All rights reserved.<BR> > +# Copyright (c) 2019 - 2021, Intel Corporation. All rights > +reserved.<BR> > # Copyright (c) 2020, ARM Limited. All rights reserved.<BR> # SPDX-License- > Identifier: BSD-2-Clause-Patent # @@ -805,20 +805,26 @@ class > PlatformAutoGen(AutoGen): > # > @cached_property > def BuildCommand(self): > - RetVal = [] > - if "MAKE" in self.ToolDefinition and "PATH" in > self.ToolDefinition["MAKE"]: > - RetVal += _SplitOption(self.ToolDefinition["MAKE"]["PATH"]) > - if "FLAGS" in self.ToolDefinition["MAKE"]: > - NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip() > - if NewOption != '': > - RetVal += _SplitOption(NewOption) > - if "MAKE" in self.EdkIIBuildOption: > - if "FLAGS" in self.EdkIIBuildOption["MAKE"]: > - Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"] > - if Flags.startswith('='): > - RetVal = [RetVal[0]] + [Flags[1:]] > - else: > - RetVal.append(Flags) > + if "MAKE" in self.EdkIIBuildOption and "PATH" in > self.EdkIIBuildOption["MAKE"]: > + # MAKE_PATH in DSC [BuildOptions] section is higher priority > + Path = self.EdkIIBuildOption["MAKE"]["PATH"] > + if Path.startswith('='): > + Path = Path[1:].strip() > + RetVal = _SplitOption(Path) > + elif "MAKE" in self.ToolDefinition and "PATH" in > self.ToolDefinition["MAKE"]: > + RetVal = _SplitOption(self.ToolDefinition["MAKE"]["PATH"]) > + else: > + return [] > + if "MAKE" in self.ToolDefinition and "FLAGS" in > self.ToolDefinition["MAKE"]: > + NewOption = self.ToolDefinition["MAKE"]["FLAGS"].strip() > + if NewOption != '': > + RetVal += _SplitOption(NewOption) > + if "MAKE" in self.EdkIIBuildOption and "FLAGS" in > self.EdkIIBuildOption["MAKE"]: > + Flags = self.EdkIIBuildOption["MAKE"]["FLAGS"] > + if Flags.startswith('='): > + RetVal = [RetVal[0]] + _SplitOption(Flags[1:].strip()) > + else: > + RetVal = RetVal + _SplitOption(Flags.strip()) > return RetVal > > ## Get tool chain definition > -- > 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73929): https://edk2.groups.io/g/devel/message/73929 Mute This Topic: https://groups.io/mt/81980797/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
