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.web11.7880.1604902781433254528 for ; Sun, 08 Nov 2020 22:19:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=g7Wkm2YH; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: bob.c.feng@intel.com) IronPort-SDR: h+9LKn/+Z8z6MLa2fFolFmgTFF5FP9UXWkwYnTXD2UAmfnPYSNAgFx1RThNxj92zMTNNHT6HJH zqe0uE6vB3/g== X-IronPort-AV: E=McAfee;i="6000,8403,9799"; a="149606214" X-IronPort-AV: E=Sophos;i="5.77,462,1596524400"; d="scan'208";a="149606214" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2020 22:19:40 -0800 IronPort-SDR: wBrJWwVkzJOY0+o2OgX3qAM4B1gTGE2EnpkIQB3RWiZXTjEccJaLgwo2jZQf1HVFRIoRnDApyz veEgyxNm4ecQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,462,1596524400"; d="scan'208";a="540707894" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga005.jf.intel.com with ESMTP; 08 Nov 2020 22:19:40 -0800 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx606.amr.corp.intel.com (10.18.126.86) 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 22:19:39 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx607.amr.corp.intel.com (10.18.126.87) 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 22:19:39 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.50) 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; Sun, 8 Nov 2020 22:19:38 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bpNg6KsplgHYqfAWeQeYTXKBK9cQWsn0VFSKADOkAlR91JL3Hk3VXFuS1iwJmlTgW3ez/ix513GlZa538dkGOldZB/vsN6AkeCj+QtSf1KsANB49DloROLhu6Zn3X7OXRnF3g70078nxhVI0WFuGFChJRVuz1NH4uHaOBy+vuKnHY0EHkN5zd9zVAQ7usW8bN/GPkNvuD4mTWCOn66U7svP3QkSwUHTX7w8wvm8mUbjh867ARv7/guu7bsFBMuesO1ybmLZiW1iO3AnhJQ7KZXcyQNRFbjvD/IvOzJwI6qO8NC4LBYlWi1HUHXGKdbg8GyaLIFmfMls4tTfp7MN0ew== 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=gvJO6WXGeXXxlgSCg+RyfjdSuIHEZk+DKoz/CsmvxKE=; b=Ij93z35OeUfVEOB8K+/VSlK84lRwp+UZ2Gyy2G8PxDzS5XE6YPysPiTS0bEknZa17yVJPd3VLwLrsN0WLnxczviBGDwUEQ25PoQRLSp5HyTywsWn77f6n1aXV7cYulF/tgVnYlNb9ABmfRC518dd75t0bFn3+jcEbcVrywHiEOBaVeEK+yz4okG+Za8d6OSdQziolscRpUD7nEwu3O5Bura3ryLNRElmOWB/2kfOIcaNFwCQpBshlF7ToiRAR6awhQU0pIa0euo0TZGZCI80vBM/q0cs+bvzvD5NQnmNqgbkJEq4O4jXzD2SwNZ/CYxX6P4S7lkkLw4jJS3zQU/7Kg== 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=gvJO6WXGeXXxlgSCg+RyfjdSuIHEZk+DKoz/CsmvxKE=; b=g7Wkm2YHjJRhKtgjiMeNyDGlw6HJ08mCB4QYIDuf/gd95f1mszkmtHtJdxvA6Ksl225yM4zt9Ctmxk+2iv4gPwEfg6S7YgOZfwdOEXKJgBQJ0SyZ7yJ99/HrcoAz1xwE5pkcYw1PFmheXv+ALGO2K3LUuYHrGOM0wQraQa1Allo= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB2715.namprd11.prod.outlook.com (2603:10b6:5:be::18) 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 06:19:37 +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.022; Mon, 9 Nov 2020 06:19:37 +0000 From: "Bob Feng" To: "Liang, MingyueX" , "devel@edk2.groups.io" CC: Liming Gao , "Chen, Christine" Subject: Re: [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Topic: [PATCH.V3] BaseTools: Incremental build issue for included ASI file's deletion. Thread-Index: AQHWtkM/9emuIk4tU0uI/9gexzBukqm/VAYg Date: Mon, 9 Nov 2020 06:19:37 +0000 Message-ID: References: <20201109025121.1269-1-mingyuex.liang@intel.com> In-Reply-To: <20201109025121.1269-1-mingyuex.liang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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.46] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 38c372d3-bbd3-4e0c-d4ae-08d884776f4a x-ms-traffictypediagnostic: DM6PR11MB2715: 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: jJzrwqYAtMSSFO7K5zReXBiduGRZ+1qqw7G50wdHYvuvckcBs7QAOXhrlw7aboT0flZWuuLNB4LfHNpb60d2UKiF6tFufib1/iPQ24fybWOFPPYrKbgjiMR3hiepOyczGzS7GM+uqyKjPK/rV3NLwWNe8tecoBuZq+hHLCDgsuwZi3XOwkL++PGXq9+/JBpUK5ri7dOLsEolUmNBVApnDeFpHfhYSQ6thyMLuQqez2hXpMlwGZNbrBRyRciA6n4iqrIX5PnmsKw3V9g1Rtk2Z2zSebiGQ3ty0/JWfkQqC3vMtdlReofzLQ1kj2v3zkVZpH8umWed29pZXUDhnaKkkeMshfyin//z5ib8DcCG7kvjPG/RFfaQR3t1JfvtrjDGyMkgejOz+pPowEb+zSCX8jBdZA6ygZO7BskHVZaktMsa+Moz7G9Afn7ixWQ2IPvf9uxQ5/iqTakZFi/ODfP5SA== 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)(376002)(346002)(366004)(396003)(136003)(39860400002)(8936002)(83380400001)(8676002)(64756008)(66446008)(76116006)(66556008)(26005)(107886003)(4326008)(55016002)(66476007)(6506007)(53546011)(33656002)(9686003)(7696005)(2906002)(52536014)(478600001)(186003)(71200400001)(54906003)(66946007)(110136005)(5660300002)(86362001)(316002)(21314003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 0/0niHNPJdiFx5KrJPxdvNJ8V2mkZ+NUBf0DW+bH82r7GIkgF7ih7qbhv/tWtdUDaGFniiLpop7F55tV+bJqeA8iMItAnYeRioGg0ZfgE8e3tVVYCotsWUP99FKOoi0ymSQzizImrG+jt9DfzJYc3j7zuSQJOWfG5oGh9sCzaFM+7x26xwJ4qTkkiCIuh8lCR0+d5jdXkOTc0P3oZ6bvOBok3JV+l0uGh0s/ibm7wrKgOu3UoWdK82qweHTYCKCqW2R1zAygV9nWyXxjawD2qQtcBfcz7DlvicmsMUqDShbrLH46TzCrGNVrAxnU91kAww/82JhyTiWm8ulmLaFExTcEg7SlpZOzOMve0x7yoOLpUIBmOSyyQPuo+PCdkeL//+2D5WFyelTur7+Cb9dmhavjFe640LIOUmOVhovmFFd1hoi92bGj3fPL8ZpcB1V6Go/alQC1/Cqaxi2BrBvKiG8KXacAlfE8KwYYXngLAh09q+/50bTf5zNLo3S2sHu06NQRXLhgaYGZb3Q1DhFYxbicVrUUNmDuEQsBJHiaQA2VhMemrfr3bxNOTrDQQduOJGjLEeFG+Ig9ari0LHrerO0+Jx6SjwGEdkqle8tVY0BZagYsJIsgzwd6qje1KG2jmUCyGDR2PrmWvGNx6VzR/g== 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: 38c372d3-bbd3-4e0c-d4ae-08d884776f4a X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2020 06:19:37.5415 (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: G6VedqmIkauiEx3IszkmfxM3AYsQHBJyyIPG85KeK6xfTp2DjUtOC2GIYj0GLEbETRZmyXf9aA7EyIpYCAOm0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2715 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 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 fil= e'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 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. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen --- V3: Modify Version Description location. =20 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.29.2.windows.2