From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web12.6099.1604888935013511529 for ; Sun, 08 Nov 2020 18:28:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=jgVZll+T; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: mingyuex.liang@intel.com) IronPort-SDR: QftkBgcaap5KZRfxPMJepjaVXwaWF+AAWjBGul/mQ9y0+xTTtASl9mSdNdhv8Dy/Dr3AHZcQJd Qf4HCv5sJ+Ag== X-IronPort-AV: E=McAfee;i="6000,8403,9799"; a="167154051" X-IronPort-AV: E=Sophos;i="5.77,462,1596524400"; d="scan'208";a="167154051" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2020 18:28:54 -0800 IronPort-SDR: O1IFPE6JqjvyXF4iIVAAjjk63P4/1K/K9On+W2t3zmIJ9CjAkIfcQ9SMfV9BmLdx9oko/qjhrZ HrK+NygvIh4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,462,1596524400"; d="scan'208";a="540648758" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga005.jf.intel.com with ESMTP; 08 Nov 2020 18:28:53 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 8 Nov 2020 18:28:53 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Sun, 8 Nov 2020 18:28:53 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.106) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Sun, 8 Nov 2020 18:28:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PRHmGUFbLfxs6vkNvDOB2g9NsrvTcwN4zLwB3rcuuXe7xiJsVjstrF6wyA9Cx2vSGZhZoydMHkg+Uc0K0Q4Dbam6/Y6M8T37VKcLyONcGPtPGrs20niwq1nFpMbtwDCE+Azr0YPJhKMOUZ/fWpPyGNyvkU7BdK1tbyW8ATZuVeUTMaeUHdGiyZPUZLFKoFko0OL0ZeraInqkRRv+p0nQdloSLVge8lbXgTenALyCYlloWncSfvq05RcRNXxGZb2zJwifW+i8pk7DmDSVreUt5jDpJZj9qhlOe3CLcC+Snd8Oux3SeoEkv8NKz3rRmBzZxPbBt5/2B8w5S14p9dnHAA== 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=0v8sigpPwHRKcV2MezEN+10L5wMarznRQubJDDcMZCg=; b=Woa2o6YcW3/Gwb6PH8VnlMFeriOA/ZqKOG3DCAkqZQ4WaHv1qaAJua5dOEkJJvLIk/gkVK5hUzqrHhLhhDvPRdhvniuJf5+a0I1vwlZsSn+oqsulQxKmNUKpZYFx/bU1MpCwcLUWIXp2hkw5j8Sr6/WOAXW9UFjikXsvEXCsbp55/mA7eTVXOH5g7JBBQpLUEBque2CsfPfDz8pmr4jHoLGPq8TobiE/mOPaV6aXs4ZP0Pw/aMAn+Ttfq5/ih+SkI331hBHWTZEAmjZ1zC9va4M9RKfWwSJwB+a7xhUDdtLYz3lrXtkbHCnmgvFA2gRmxO5C/yBiHkZj7xXu4bIsYQ== 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=0v8sigpPwHRKcV2MezEN+10L5wMarznRQubJDDcMZCg=; b=jgVZll+TWS16Wvgyce4lf6W+bXjY2HIyWsDwHHCta0FtpslMz/OA9CneCNx2sw0ofCMz9oYw1xl00v+G2gy1HWAwLfx5VEfUN7w/OcIzHJdGbu5Pz9LtP7W52NrrGzzMmIKaKpCOnfmCu1zmNkxGiv+tAJLMfN5ixbnBtD3g5Go= Received: from DM6PR11MB3369.namprd11.prod.outlook.com (2603:10b6:5:b::16) by DM5PR11MB1659.namprd11.prod.outlook.com (2603:10b6:4:6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Mon, 9 Nov 2020 02:28:50 +0000 Received: from DM6PR11MB3369.namprd11.prod.outlook.com ([fe80::e911:9d94:79ae:cba0]) by DM6PR11MB3369.namprd11.prod.outlook.com ([fe80::e911:9d94:79ae:cba0%4]) with mapi id 15.20.3541.025; Mon, 9 Nov 2020 02:28:50 +0000 From: "Mingyue Liang" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: Liming Gao , "Chen, Christine" Subject: Re: [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Topic: [PATCH 1/1] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Index: AQHWtAF2AjsMRvF07EuCrav6FWAJpqm69BuAgAQjZEA= Date: Mon, 9 Nov 2020 02:28:50 +0000 Message-ID: References: <20201106055527.722-1-mingyuex.liang@intel.com> In-Reply-To: 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.102.204.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e96f14e2-83e8-47c5-d584-08d8845731f2 x-ms-traffictypediagnostic: DM5PR11MB1659: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2958; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: CpcIUYprqaZVFbDmZZc4scslqhcDR8+IfdZBBiqHOuWgJeGMmwSwFeseY6fwKV69woYHXONmZTuxMzMZSmmSSNtdcQ8qWw56zZJSAiKH9dxDOV9dPWy8Oi2s1D4l1HkFHsK5a6P0GlVyGdIR1Bg0uX2zAxtkyyYwQDc2kV7lf+EjAPoXIv4GM1Tet49utRVkM42lezladSYb5mPNlftJ7+IR8Pr5MPwpsfl6P7J1NHPbxXXEs6t0F0El4lKKPlW/4DDly8MCI1EGyd3DIPN5ecR26XmBXGY1FNQ/UjH0fZA2jo2Yc6AkTShrgiYkjmdhNGwLheMxvsQx4o8IAW4OZeD29HWbBkBwbheopnHsiKhioRuoAJcQxpokCHzvMRUkjRe7pibFZutb2nTEokYQ0R5X3nJ6IKyTykQH21S/ZJo59KUr4yDyttr7lmGPor/+r3gql/QCLogyRyXofAfIWA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB3369.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(136003)(396003)(376002)(366004)(39860400002)(66446008)(66476007)(66556008)(64756008)(53546011)(33656002)(316002)(76116006)(66946007)(7696005)(107886003)(54906003)(86362001)(478600001)(8676002)(5660300002)(52536014)(8936002)(4326008)(186003)(26005)(6506007)(966005)(55016002)(2906002)(9686003)(83380400001)(71200400001)(110136005)(21314003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: e5jBe9y1fjgPNon1P9NPJ7TqsPhwnE2ktJnW7zeH+F5774U8ITNmELNZL9GfiGoczkV4DINJ55FJXUClEEjJxhKEiJ2sTIM8HnLeF1FiPlA2gt4Um0HK9jt+BwVA6KhKV57LgmBvR4oD8mi9Usen99r8qi+LOxxHcfc5yvcYsdAylUsz8pBXYLFgFpQNbMYTYBaO/oAwFP+9fJCwNM9HKR8utux3O96U8dLccKa/Wpy3AM2aUcORXDwzmVyUJGDPnG39HipDJL/Izg7epYZI6b3PcRaVPodaDdFUrNaE4LyVIBc53SiBf/7qCsKsiZ7au2NFXTQCh30HROu128LICxFi0A3GfB0woRYnh9MLOIA9KUa25pdM57rBDOtcVF7CDUeuWI/fDZFe6DoG6EFLuOU4E3L2C49bBoV4XeO5V5xW7PyDF9jnbgfmU/an8Nn3+r+lBbPFmxVsuy2pFs4lGC5X2Im0k0LUN8ad76Xwpo1a6mszvN8AMs03aeqzF5tmlKRZHnhhEcySTw81EKy4vZEj9Ci/dQlnFEgPaTccMWtmYGP5GHdUAVB3GM7BSR21kBiYUVOJEQSjURDYXTUOt5XVU7ROrGZpdNnuM6b4K6S/RO7Rg9bswlNbdn9cnNH4tWdAZhne/SbRMcKutSDxRw== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3369.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e96f14e2-83e8-47c5-d584-08d8845731f2 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2020 02:28:50.7074 (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: 64MfLyCtBGceR/mIDHxLueG6Fvn3DeYcGnu3bNCy+JLiS1Ap3jwZ6NnnCZZ9dBi3gXkl3Rs9tf8+bnwqAKQuiNVg+HFmm0fdGlh6zezfJV0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1659 Return-Path: mingyuex.liang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable V2 version updated. Patch link in https://edk2.groups.io/g/devel/message/67133 Thanks, MIngyue -----Original Message----- From: Feng, Bob C =20 Sent: Friday, November 6, 2020 7:19 PM To: Liang, MingyueX ; devel@edk2.groups.io Cc: Liming Gao ; Chen, Christine Subject: RE: [PATCH 1/1] BaseTools: Incremental build issue for included AS= I file's deletion. Please add this BZ to the patch commit message. https://bugzilla.tianocore.org/show_bug.cgi?id=3D2972 Thanks, Bob -----Original Message----- From: Mingyue Liang =20 Sent: Friday, November 6, 2020 1:55 PM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine Subject: [PATCH 1/1] BaseTools: Incremental build issue for included ASI fi= le's deletion. When using incremental build to delete an included xxx.asi file from the AS= L file, the xxx.asl.trim.deps file generated by previous build process will= not be deleted from the OUTPUT directory, which caused the dependency file= still include the xxx.asl.trim.deps file. If the include file is deleted and DEPs is empty, the DEPs file is deleted. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen --- 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/Python= /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,AslDeps= =3D False): AslIncludes =3D [] Lines =3D DoInclude(Source, '', IncludePathList,IncludeFileList=3DAslI= ncludes,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.base= name(Source))+".trim.deps", " \\\n".join([Source+":"] +AslIncludes),False) + =20 + 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.28.0.windows.1