From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web09.5230.1582815399367415243 for ; Thu, 27 Feb 2020 06:56:39 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: liming.gao@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Feb 2020 06:56:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,492,1574150400"; d="scan'208";a="272238944" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga002.fm.intel.com with ESMTP; 27 Feb 2020 06:56:37 -0800 Received: from shsmsx605.ccr.corp.intel.com (10.109.6.215) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 27 Feb 2020 06:56:37 -0800 Received: from shsmsx606.ccr.corp.intel.com (10.109.6.216) by SHSMSX605.ccr.corp.intel.com (10.109.6.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 27 Feb 2020 22:56:36 +0800 Received: from shsmsx606.ccr.corp.intel.com ([10.109.6.216]) by SHSMSX606.ccr.corp.intel.com ([10.109.6.216]) with mapi id 15.01.1713.004; Thu, 27 Feb 2020 22:56:36 +0800 From: "Liming Gao" 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 Thread-Topic: [edk2-devel] [Patch] BaseTools: Remove invalid leading space before !INCLUDE in Makefile Thread-Index: AQHV7XnSkn4Z+06O2kGFXnb+4nucB6gvISbg Date: Thu, 27 Feb 2020 14:56:36 +0000 Message-ID: <531c2593d7904b1abb4fde6d912c9d61@intel.com> References: <20200227142524.24504-1-bob.c.feng@intel.com> In-Reply-To: <20200227142524.24504-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [10.239.127.36] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao Tested-by: Liming Gao -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Bob Feng > Sent: Thursday, February 27, 2020 10:25 PM > To: devel@edk2.groups.io > Cc: Andrew Fish ; Laszlo Ersek ; Lei= f Lindholm ; Kinney, Michael D > ; Pierre Gondois > Subject: [edk2-devel] [Patch] BaseTools: Remove invalid leading space be= fore !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 when using nmake. That's introduced by 818283de3f6d. >=20 > If there is white space before !INCLUDE instruction, nmake will not > process it. Source code's dependent header files are listed in > ${deps_file} file, if it's not included successfully, nmake will > not 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 b/BaseTo= ols/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