From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.20834.1604967701476846001 for ; Mon, 09 Nov 2020 16:21:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=k3SYZn6w; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bob.c.feng@intel.com) IronPort-SDR: Gbx3GW9RNm7YHV/bxHVoutc5xodNhsujcCoh0+3mnLDoaHLZ14MOp08gnHQCJMhAI2ZpWBlS7E A9pnL8anJUUA== X-IronPort-AV: E=McAfee;i="6000,8403,9800"; a="166381737" X-IronPort-AV: E=Sophos;i="5.77,464,1596524400"; d="scan'208";a="166381737" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Nov 2020 16:21:40 -0800 IronPort-SDR: FgQ6a0VqSO7SmLZR9MsvTSGL0H8UUlxIxlczPJFc7VO98Q6NTk7ScaORkFE5uqS8lkIw5HBKPA 77zRhk5aUYWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,464,1596524400"; d="scan'208";a="365279980" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by FMSMGA003.fm.intel.com with ESMTP; 09 Nov 2020 16:21:40 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 9 Nov 2020 16:21:39 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 9 Nov 2020 16:21:39 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 9 Nov 2020 16:21:39 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.171) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Mon, 9 Nov 2020 16:21:34 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C5Rb4Cxx5vSwvWkc56O0d6WI+Ruy4fTzgP2WfHZqFZQhdz2C2Zg/4722imNfl+n983yMVpY5Sp5tK0JhZDNCzGZXRtn0DV5Kc/ij5QfLca5e8z2FlhKqMbhQnXlzH+NNcK4H9DquZ+lmUxpIwApyw04fomTg6grsAg792Yr/c6Zvy5YMCvcaaqy1IQd/XKIwFRj+952uLcleVEqpHTyODovce4LVUXsQ4atWszLS2YT0Ztx9T8207E2w+5an9LA5jiR/8Xq5WOZAj+6Il5mOhRM9aBtX6RQG6TiU21amRI3253vioRo3OKgTT7D3EayQSCnsZzOeYV0kqEGibiy3aA== 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=ylKqMqRl8Yz4g84zSC7DqNuzYboUDlJsmanbB4YVN94=; b=au/b3/z7o2F0pvmspiwnAhB6qSichyTpIVqDz1OlWPjRNkrtFFySb2RzLvXbyg4zTQIPKb5DlQw/51a5aOtC9Pev6ORSaoL4lXRUBV/gvCOwOfQifPtak2uAcJj6BH94MSfw57Czwo2btwwnfNVIVxeqr8h2y0KY9FVGlTbUcjrmarVB0DbPUy1mvMoKUk9vDXPWgM+Wft2iruphntqiWV+l4m3UGIQcv8G97JCGfZSER82B8wVVfEQXmPjyZwHhBlhqpe5LF+hEyV4yxq5voA4BvUn7ui8+NRVOngvyjp0j5VWL78n5FRSKJLmQG/FS21M8lbrg0mx2cY9LXRgaWw== 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=ylKqMqRl8Yz4g84zSC7DqNuzYboUDlJsmanbB4YVN94=; b=k3SYZn6waEwo9Bsk79huAkBq4XCDDnxCOx9s4HnPeRchoA3zJaPVaf2BwcQs7nNZtbfF33sx1451IhmN76DpW0gU83D+wBdD7hIucqFoJ7FTp47v6Q9wjyMdHN4D0/PrybeDy+G612hSo4bDoJlhhUcapg8GXSBfCdtYZtXUKhk= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB2810.namprd11.prod.outlook.com (2603:10b6:5:ce::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.28; Tue, 10 Nov 2020 00:21:32 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::c9f:47ea:6321:5ccb%3]) with mapi id 15.20.3541.025; Tue, 10 Nov 2020 00:21:32 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Feng, Bob C" , "Liang, MingyueX" CC: Liming Gao , "Chen, Christine" Subject: Re: [edk2-devel] [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Topic: [edk2-devel] [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Index: AQHWtkM/9emuIk4tU0uI/9gexzBukqm/VAYggAEuQ/A= Date: Tue, 10 Nov 2020 00:21:32 +0000 Message-ID: References: <20201109025121.1269-1-mingyuex.liang@intel.com> <1645C293A820CE46.8542@groups.io> In-Reply-To: <1645C293A820CE46.8542@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.46] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: da6d83c7-587c-4cad-23f1-08d8850e93cd x-ms-traffictypediagnostic: DM6PR11MB2810: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3968; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: nfJXR95vzctvqmI1ByJbvqBqdz80z68DC4nqXXk48Znpo6wQqU9jOPUykbh0l+PwfTsM102J9ZRMEmZvLDDfHRz7H6tB3sVEDEWSDJc5H/zmZy6AHSrg6ZcUVD5SPgGUnvjvFM1nxQQdjIFzhmnGQq6mh3FySiYEMyEcKKitFMAdBpHcxbk/Zv5E+8dcZYtIRHQFpsDwi/6NP/Ah/DIoNHqvc5bzGtDFJ8vFZbhsgAj4cg+LwGC52LE+3guhmygezLxQ++TKFcKiIf6D63WcFEgV1CUpcOWGKu6725+F+9Eusk5kdnek7vcXoBR5y7qqE4RCfc5nEAzPwpll2jTEcfMZ9qseugCuxOWYh2Czu98yaM1prCmF2kZCfpnT/wuLtlWL+tGyA4TzY19apiysZSOjWkQVZ6e0cn7t58INhmZErPFtsvTw2uGLP1GOOXHABqR9xNVe2qWzNsbsHg7N+A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(346002)(39860400002)(136003)(376002)(66556008)(76116006)(26005)(86362001)(4326008)(478600001)(66476007)(2906002)(107886003)(6506007)(186003)(52536014)(66446008)(110136005)(54906003)(53546011)(966005)(66946007)(64756008)(5660300002)(83380400001)(9686003)(6636002)(7696005)(8676002)(55016002)(71200400001)(33656002)(8936002)(316002)(21314003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: /zmr6+PPMd8ctvI4xKReCI4nsg/1k6lhjG4fdywGgx20iYmrV4s2WzsRNRl5FUDO0DtpaHC59566kd8Piok6Ro5+IV1YDw2h7q+dxmwmg99+eLIMBr3I3bn19HjOjY/sDIMb7kMoubsfJhICHHqD6lmrjdEkNIeegxffsi8/x2ry2lZc7cBjhDFbkJKn66vfICE293SLnwa4Ed37vM5V4LrKvDWqcy45O4pU6vTA88Z9FvOcMNtUz99wTsWE8PezXHHv2uMREnn4kPK6B4B+DMcLJQN0Sn//+dsgRADM6KGzbzS9Rl4Ds+LxSYy8DY1frbbo50kcuHCkeHvyqPyM6Kak/lBkvy7NS6t1ulldVBuSY0QlvFdpbrdpFemMmJEXtV1U/5jFcrsbd4+JYeA/Ih/SedYMUNA2IWwlcwI/TpGNnZ9lgd64o0H76Iq/tfX8hu0JKcNpwnuoPExm1ADRpbelUJnPVjYYnowcryqtIvioibAxGRpProEGzeO0GBsrjwtuwp0wwRR9GP4kIIES/0iUCuOdN19Fx8da1HDGES2kHQ7NhtYY9MvQX7tDH5OmYgMZTRreF7eT5Pgp11CBkUtOzKC43BLE2touso+bpoKX7qATSlAyeOt3g27xJq/Nttz6y93D+9K32PBzi6TipsfB3txP3wSVWpVkZorWzDt9oZJoJrGU/vLETuSt6Is8m6RW9AYRbumIwbMOyudRWWjdECeTRXEGaemByDIzf0XCFTJeZjVRU3HlJKmxeTnt4qSXatNy/NkZo6piOT6U6R/S1T/aFbDkba2CePlVKhrw6hdQ3d9/t84Eyl2tVLn7O9SHm8zjF444gy3aucnuUZiL1ynVl5xJZDTuMolLs9/5OWMzvOz8CAZrD83PU3zpq8nHc8dn85dMo/q0GaS33Q== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: da6d83c7-587c-4cad-23f1-08d8850e93cd X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Nov 2020 00:21:32.7477 (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: DBxXPEUbscc82JfasnkxHJjo7t+PEVt5780QS1gLvUpW68CAV3zRj1Uw6IKRZJi7a0xDSH0XHpgTGhAiEiGmvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2810 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Created the PR https://github.com/tianocore/edk2/pull/1102=20 -----Original Message----- From: devel@edk2.groups.io On Behalf Of Bob Feng Sent: Monday, November 9, 2020 2:20 PM To: Liang, MingyueX ; devel@edk2.groups.io Cc: Liming Gao ; Chen, Christine Subject: Re: [edk2-devel] [PATCH.V3] BaseTools: Incremental build issue fo= r included ASI file's deletion. Reviewed-by: Bob Feng -----Original Message----- From: Mingyue Liang =20 Sent: Monday, November 9, 2020 10:51 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine Subject: [PATCH.V3] BaseTools: Incremental build issue for included ASI fi= le's deletion. REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2972 When using incremental build to delete an included xxx.asi file from the A= SL file, the xxx.asl.trim.deps file generated by previous build process wil= l not be deleted from the OUTPUT directory, which caused the dependency fil= e still include the xxx.asl.trim.deps file. If the include file is deleted and DEPs is empty. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen --- V3: Modify Version Description location. BaseTools/Source/Python/Trim/Trim.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Pytho= n/Trim/Trim.py index 776474b20349..c479f7d2b2e7 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -372,8 +372,7 @@ def TrimAslFile(Source, Target, IncludePathFile,AslDep= s =3D False): AslIncludes =3D [] Lines =3D DoInclude(Source, '', IncludePathList,IncludeFileList=3DAsl= Includes,filetype=3D'ASL') AslIncludes =3D [item for item in AslIncludes if item !=3DSource] - if AslDeps and AslIncludes: - SaveFileOnChange(os.path.join(os.path.dirname(Target),os.path.bas= ename(Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False) + + SaveFileOnChange(os.path.join(os.path.dirname(Target),os.path.basename + (Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False) =20 # # Undef MIN and MAX to avoid collision in ASL source code -- 2.29.2.windows.2