From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.12022.1600936861343982374 for ; Thu, 24 Sep 2020 01:41:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=UwlQthrz; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: yuwei.chen@intel.com) IronPort-SDR: bWlIzspH9rlyGmU6or1P8ZrcFe5qDGbuKZafJjkf5aqE/peGR8XcQKzvUfqCGYcKxD3jDmKbkn HEqvHX+4g4Ew== X-IronPort-AV: E=McAfee;i="6000,8403,9753"; a="141161134" X-IronPort-AV: E=Sophos;i="5.77,296,1596524400"; d="scan'208";a="141161134" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2020 01:41:00 -0700 IronPort-SDR: fItn63eWv6TEGcpTWz+XKhaRJPZES8oxZmDGe54xCZVb7xJXQosW/mdWi3UXYHtE0IuHmO8z/a Gj3R7x714fVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,296,1596524400"; d="scan'208";a="305746023" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by orsmga003.jf.intel.com with ESMTP; 24 Sep 2020 01:41:00 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 24 Sep 2020 01:40:59 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 24 Sep 2020 01:40:59 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Thu, 24 Sep 2020 01:40:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8Ty+Y80LPYN4NxD5Jf83l0NssqAVf2m4HxFRSLzF4tI4gNNBO++FEWzEuvr8gQLQhjJK38k/4x7/DrHSMEnvo0gZHYnx0iqCarIg47TIgUk0uBDChkb0b2MKYF6TDo9A56EnOWTTVmUfrMtW4h2XeMW9UIwxCP/9BrHTB68LxmHvK132WmQPYzEfK+PU7CHrDvvllmUPP1BsGivoolMamh1UgqN1q53ZBodzWDdAQ/UY0+uN1FU7SilAfDF0RdzeVD2PA045g2UJ1kdj/EjtWG7ISu4uHiekQCq1u7b90Ir0ReXCKv598vYlkyPzRUQ/ZBzFfv2GGkftzY9uyZq4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ee2Mo4DCW8/GqG1IdsB83jfFoFP/B04rgeMSMiiGyqA=; b=Q4m6dFn0JwDbBVG79rfgsAfYvTmxeP46n/kwBFtk1UgeXhcqBthLNCOj3dkEiOk5pjYXSvqsoATe9m/F0/07BnJ0Ov2J+9nxU/fB72zXPLOYLUUnxChjD78Kyuj4YyuzZeggUFV6kRzx053DdzsZF8fZkxxdIOa3GtwLWl86Ntu4EFxNIndG5uVqQ9D0/OG+4Gt5C72kgIiWkqKjHagNuolOJCw+tJpad68AQWHtaTl9Ta3y0UoIi3+38rbZuVx5LpWyzh+kqtnNNR0Kw8w5stnUOH7lQAO5HCh+uP73PRXITu9S73MPe8c8WHCF42aEIVmyHT34C15yTy0Y7yFg6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ee2Mo4DCW8/GqG1IdsB83jfFoFP/B04rgeMSMiiGyqA=; b=UwlQthrzjfZ7qBnzgok0U1AUuwhVMLScCCSJNuVe9X5GYThjNBVpGuMDb9gnhMQpXtcXRPxfoN+nCHpm1p0AZx8Ll0/ewp5A+6PbfSeVZ74nZmRBscCC2QBtfl+yjRKLqgNbXOVCeWKw4MoMkGO1RL7/xMUx+qjZDihu7HU4z8Y= Received: from DM5PR11MB1594.namprd11.prod.outlook.com (2603:10b6:4:5::16) by DM6PR11MB2683.namprd11.prod.outlook.com (2603:10b6:5:c6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20; Thu, 24 Sep 2020 08:40:57 +0000 Received: from DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::952e:51d:d3db:b10a]) by DM5PR11MB1594.namprd11.prod.outlook.com ([fe80::952e:51d:d3db:b10a%12]) with mapi id 15.20.3412.020; Thu, 24 Sep 2020 08:40:57 +0000 From: "Yuwei Chen" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: "Liang, MingyueX" , Liming Gao Subject: Re: [PATCH] BaseTools: Add included files to deps_target file. Thread-Topic: [PATCH] BaseTools: Add included files to deps_target file. Thread-Index: AQHWkZes+smbkus/70WSfdzvVBrD4Kl3eZ1g Date: Thu, 24 Sep 2020 08:40:57 +0000 Message-ID: References: <20200923105226.46336-1-bob.c.feng@intel.com> In-Reply-To: <20200923105226.46336-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9e275f9d-e7a5-4fb1-624d-08d860658eda x-ms-traffictypediagnostic: DM6PR11MB2683: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gNkOpe9uKb9NOkgCIiygrSXTKh7cpdwVJ/cF6fYq41IjYMG9BIqKxfvG7ELQpuf22y4dzKc5Ayvy9sIuHnUxIJOn3++b2CR63naOqiVUPcu9uu7m7AwTpxrZiOoQsJiMl5Rme9sk+47GkQ2jdRe3gpg0NP/mlv7U9ebIR290kx1pw5yZRCWxH+/Qh0RZaunJ8a5kAI9s808gGGJTLern6cPINwrvg+7oq5Dg6tCGH7ilyxa6wGX0Iers8eBGQMrn8XZhJqsS0k3q/GF6yuRmA5QGfgPbzuTK+xJGmlgYFRa16yVgqnr5GSZQyMkp/bbYs7Pb2tQX95osdaJd2FRhZKf6xTykSocS7T4zsc5muMe5o3vTQPZ33o0ziRqr11LRf+LfG5FygxjUA565W5STmQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR11MB1594.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(346002)(396003)(366004)(136003)(376002)(6506007)(53546011)(7696005)(4326008)(110136005)(54906003)(478600001)(26005)(83380400001)(55016002)(33656002)(52536014)(966005)(76116006)(9686003)(5660300002)(66946007)(66446008)(71200400001)(64756008)(316002)(8676002)(2906002)(66476007)(86362001)(66556008)(186003)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: uFiAvaxDJGqqHfxSGCDG1JOM42PKxIma8Dg+VHW4VNPT1cqYJk872MES0GOLQMl/YzU6LxFsmxz975uCXvkP+nvK4112+bd2tFUHtnWzkAuPGLwzvTw+AsVgzGJGeBhuUXsS7v7UG4lYzwRakqIWBqmHi3jWwo4a1RcOaQC6CQYWCr6DtBSqO7Op0i6SbfAQlbKiN5mzV2m+lmDXOUnwSW8EZ/VZlrWWVPtk1UCaZ17pwEarM2MqT8WfzS86fXH7TYhO8M4XTMTJPiDyMukigYkMe3D2DMLggjXkBCKoRQY4oc+FNuss6hqBadxgM9W44K4K0ipEGfcqY9LJvu8qtr+jce4RB3wzJCropXcvXv/kTt3ef0LqDeeULSv3GhgCxnXfqBEfWYuMPvKfjtBxyi0kr1gwwWoMiuoR3P44X/dpFjz4xRHAOuBdgxqDHvzhus5++gUU2VqOu1lXEmzdcbT9K4txOKnfn7Q+st7W20Pqyw9EGjlh1UhYIIYE5IaiEFcak5eRecr8O2MLDF/p9tGAKSnYZOSGExAyv0O+/L+TzGNLeGWyToAhjlWguxkkyhYLbS4AAXce7keOPBTG1o42XQkyn9AOwg3gBgtorP3kXoNE6KJRtZlQleVYC9kFA8gMMzsLSJZTGUVgpUrDiQ== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR11MB1594.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e275f9d-e7a5-4fb1-624d-08d860658eda X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2020 08:40:57.5426 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: D8muoMXLxIK6+5WvmlOn/YS98sQ+Bycxb4sWzDuzn09AGNo9ptdJOJqOH3vft4L+XjUaRIv/OI8/gPKmIq0DaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2683 Return-Path: yuwei.chen@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yuwei Chen > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, September 23, 2020 6:52 PM > To: devel@edk2.groups.io > Cc: Liang, MingyueX ; Liming Gao > ; Chen, Christine > Subject: [PATCH] BaseTools: Add included files to deps_target file. >=20 > From: Mingyue Liang >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2882 >=20 > After changing the name of the include source file, when doing incrementa= l > build, the previous source file is not covered in the. DEPs file, and a b= uild > error occurs. >=20 > The root cause is that the build tools filter out some dependency files, = which > are listed in inf source section, from the deps_target file. > Add those files back to deps_target file to resolve the above problem. >=20 > Signed-off-by: Mingyue Liang > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > --- > BaseTools/Source/Python/AutoGen/IncludesAutoGen.py | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > index 720d93395a..c3e6333217 100644 > --- a/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/IncludesAutoGen.py > @@ -103,7 +103,7 @@ ${END} > if os.path.normpath(dependency_file +".deps") =3D=3D= abspath: > continue > filename =3D os.path.basename(dependency_file).strip= () > - if filename not in self.SourceFileList and filename = not in > targetname: > + if filename not in targetname: > includes.add(dependency_file.strip()) >=20 > for item in lines[1:]: > @@ -116,8 +116,6 @@ ${END} > if os.path.normpath(dependency_file +".deps") =3D=3D= abspath: > continue > filename =3D os.path.basename(dependency_file).strip= () > - if filename in self.SourceFileList: > - continue > if filename in targetname: > continue > includes.add(dependency_file.strip()) > -- > 2.28.0.windows.1