From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.8940.1583117272672517113 for ; Sun, 01 Mar 2020 18:47:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: bob.c.feng@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Mar 2020 18:47:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,506,1574150400"; d="scan'208";a="233013189" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga008.jf.intel.com with ESMTP; 01 Mar 2020 18:47:51 -0800 Received: from shsmsx602.ccr.corp.intel.com (10.109.6.142) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 1 Mar 2020 18:47:51 -0800 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX602.ccr.corp.intel.com (10.109.6.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 2 Mar 2020 10:47:49 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.1713.004; Mon, 2 Mar 2020 10:47:49 +0800 From: "Bob Feng" To: "Gao, Liming" , "devel@edk2.groups.io" CC: Andrew Fish , Laszlo Ersek , "Leif Lindholm" , "Kinney, Michael D" , Pierre Gondois Subject: Re: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile Thread-Topic: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile Thread-Index: AQHV7XnSGU7kEWw5zUC2jXd0fMGVb6gvISbggAV9nmA= Date: Mon, 2 Mar 2020 02:47:49 +0000 Message-ID: <122f5050abe2481aae362d8596929372@intel.com> References: <20200227142524.24504-1-bob.c.feng@intel.com> <531c2593d7904b1abb4fde6d912c9d61@intel.com> In-Reply-To: <531c2593d7904b1abb4fde6d912c9d61@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.36] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch was pushed. https://github.com/tianocore/edk2/commit/2be4828af1c92a848af90429a9a0b4454= 4c80553 Thanks, Bob -----Original Message----- From: Gao, Liming=20 Sent: Thursday, February 27, 2020 10:57 PM To: devel@edk2.groups.io; Feng, Bob C Cc: Andrew Fish ; Laszlo Ersek ; Leif = Lindholm ; Kinney, Michael D ; Pierre Gondois Subject: RE: [edk2-devel] [Patch] BaseTools: Remove invalid leading space = before !INCLUDE in Makefile Reviewed-by: Liming Gao Tested-by: Liming Gao -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob=20 > Feng > Sent: Thursday, February 27, 2020 10:25 PM > To: devel@edk2.groups.io > Cc: Andrew Fish ; Laszlo Ersek ;=20 > Leif Lindholm ; Kinney, Michael D=20 > ; Pierre Gondois > Subject: [edk2-devel] [Patch] BaseTools: Remove invalid leading space=20 > before !INCLUDE in Makefile >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2563 >=20 > This patch is to fix a incremental build regression bug which happen=20 > when using nmake. That's introduced by 818283de3f6d. >=20 > If there is white space before !INCLUDE instruction, nmake will not=20 > process it. Source code's dependent header files are listed in=20 > ${deps_file} file, if it's not included successfully, nmake will not=20 > detect the change of those header file. >=20 > This patch has been verified in Windows with VS2015 and Linux with GCC5. > The header file add/modify/delete can trig the incremental build with th= is fix. > There is no impact on the clean build. >=20 > Cc: Andrew Fish > Cc: Laszlo Ersek > Cc: Leif Lindholm > Cc: Michael D Kinney > Cc: Pierre Gondois > Signed-off-by: Bob Feng > Acked-by: Laszlo Ersek > --- > V2: > 1. update the subject > 2. remove the Reviewed-by and tested-by > .../Source/Python/AutoGen/IncludesAutoGen.py | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py=20 > b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > index 0a6314266f..720d93395a 100644 > --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > @@ -50,21 +50,21 @@ class IncludesAutoGen(): > MakePath =3D self.module_autogen.BuildOption.get('MAKE', {}).ge= t('PATH') > if not MakePath: > EdkLogger.error("build", PARAMETER_MISSING, Message=3D"No M= ake path available.") > elif "nmake" in MakePath: > _INCLUDE_DEPS_TEMPLATE =3D TemplateString(''' > - ${BEGIN} > - !IF EXIST(${deps_file}) > - !INCLUDE ${deps_file} > - !ENDIF > - ${END} > +${BEGIN} > +!IF EXIST(${deps_file}) > +!INCLUDE ${deps_file} > +!ENDIF > +${END} > ''') > else: > _INCLUDE_DEPS_TEMPLATE =3D TemplateString(''' > - ${BEGIN} > - -include ${deps_file} > - ${END} > +${BEGIN} > +-include ${deps_file} > +${END} > ''') >=20 > try: > deps_include_str =3D _INCLUDE_DEPS_TEMPLATE.Replace(deps_fi= le) > except Exception as e: > -- > 2.20.1.windows.1 >=20 >=20 >=20