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.web10.10435.1600928959812632648 for ; Wed, 23 Sep 2020 23:29:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=B1Qk0C/Y; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: yuwei.chen@intel.com) IronPort-SDR: a7R11TvTVplPPxmqcCfUyZztRGY3kiqF4gxjAy0BVQxAlxSsgERzLP1hZWWU3wBhDUtijLWKip InnFUt4Ndtdg== X-IronPort-AV: E=McAfee;i="6000,8403,9753"; a="158476914" X-IronPort-AV: E=Sophos;i="5.77,296,1596524400"; d="scan'208";a="158476914" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 23:29:19 -0700 IronPort-SDR: S18p+fzqiu3k6zt/+1LI0S0tgTH64OiHKkiaKP+jITZlX6d0w9Nef/qktZIXqXSLMAhRQ37R4G tIUkIr8kBRHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,296,1596524400"; d="scan'208";a="305695664" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga003.jf.intel.com with ESMTP; 23 Sep 2020 23:29:18 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 23 Sep 2020 23:29:18 -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; Wed, 23 Sep 2020 23:29:18 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.102) 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; Wed, 23 Sep 2020 23:29:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nUTFPo5w+NC+6enecM8QyJ/TEIA/9ffq4hvX/+GpjPuWuXGi55yDrePKeH+OzxHg0QhZ3VWhF3qFTNIBnVIObxMJkQaAJ1B0pA0a6Q9r74vsmKXmLNcL2wCKBdbw3mt05nTXjnUyCIyz8O4UtgtEtrtDQNEwsxCmyFqXmqt6i5saTrtt3CD2YfdtSzjEfj0HjVXqn2+NyY4zunSVy5TJh6mHZLBasyq6fzIjAW86rdQaJmnwLc+eZ6xjFQatz+m2QlqAvIFZJpJQuwg81wb4nF3H4mHS+9jPskMlpxYaL3/jROKVnHFFF31oY1DJccP/b33AjrBicclSt2EVUzyEUw== 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=PmVh1Cs7SdBz/7ZYSGtb8TQA6yS0DhEPQ+TKZ9Nntxs=; b=Tblzj0ZNgOxMHsyj2pXJxrY5dmQ7BhOwnDoIep0zRGUHTBTdAHYHN7FXNNOBzkfjlM+qoK1kjt5hYdVRLqqyp7bDH/D27pI9xXr07NSMSbdOmP03veokccKIXsAGm921Raal0wQRtOvb/bcfIdAIadLOh/u34uT5U2rvFUTqm/ksqxvkL1aSzIXJEeyW4fZLDrKcErR6EjJBnn4bou5gx65DEd49Qp2hABNYNq5R9eOcgTML5thZV321TteP3xzw1MWXE+juNIw5IaAv+1+tyHKjfc4EoeLZN9DaabfbEeQHXSsaj0n285ku2uHix9M8ki7OF7GyRYhef0AV7jPDAg== 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=PmVh1Cs7SdBz/7ZYSGtb8TQA6yS0DhEPQ+TKZ9Nntxs=; b=B1Qk0C/YXkafNNgUEdHspCW4D5jY2mcUHYYm0AxLtUN39Knw1uiZJ9NLSOt+O+Vj8eXX8EvXkCOHKXEHkcTfdpkuDQTSCDy6tgL/3uCywxUCivXCyftYqNScw+h2w8NfYt73KDzyDsbK0yeKhgN8xHZIW1atYnDasN7IxakNtZw= Received: from DM5PR11MB1594.namprd11.prod.outlook.com (2603:10b6:4:5::16) by DM6PR11MB2841.namprd11.prod.outlook.com (2603:10b6:5:c8::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.19; Thu, 24 Sep 2020 06:29:08 +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 06:29:08 +0000 From: "Yuwei Chen" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: "Liang, MingyueX" , Liming Gao Subject: Re: [PATCH] BaseTools: Normalize case of pathname when evaluating Macros. Thread-Topic: [PATCH] BaseTools: Normalize case of pathname when evaluating Macros. Thread-Index: AQHWkZhp6zKyfI2u102KLzvbZhCLkql3VMLQ Date: Thu, 24 Sep 2020 06:29:08 +0000 Message-ID: References: <20200923105732.34648-1-bob.c.feng@intel.com> In-Reply-To: <20200923105732.34648-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.102.204.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9d714695-4776-47dd-4d6b-08d860532477 x-ms-traffictypediagnostic: DM6PR11MB2841: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: t4SLV5G7YCRKe7vaUcZdwzPter44k1m9FgKSv5ZRD+Y8Hg9alJ2A4AUI66swSc5uALHWigzaxe0IaVQWNPSd5e02TdpamcDViQGqoG8fGctUFwK25Q73yNNF4ZfS1Ja/+J2tZYkv0A/eo2RJMJlTVDjGP6Lc85YB1p4ttGGaIUcrQaECqZ1098cZlZS9huwRR+4ggr1aEIj3W7lFzPe3AXICJIdGzRY66jvLVDvp8ruOlrQbJqzkR8FVNkNcxxNneznlx6jmXqOr5LdtIBbmh8zoHa4KwbUPNrT/s2Y/XbHLjXkw/tTAxC/kKTHkrzt1J7HFO/+O7ynBBaHCE3+tq2vqU/sODEo43Id9UQI6l32dbU5v9Wp9706fwOGdQrbfHx8dENk1iORMirYXPqEsPUnuitXG2L+cEN9fqZHOK8cAeBh1OoVA9b7Wmkjm00y4fKJSocbWRq7a5Z3FqemL5A== 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)(136003)(346002)(366004)(376002)(39860400002)(396003)(52536014)(186003)(64756008)(86362001)(6506007)(53546011)(26005)(66446008)(9686003)(66946007)(66476007)(55016002)(76116006)(66556008)(7696005)(83380400001)(110136005)(33656002)(8936002)(478600001)(5660300002)(966005)(71200400001)(54906003)(8676002)(316002)(2906002)(4326008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: DPeZBOt8NeKWghU04vJmQryCpPJR5W5LMIqEikLi5UK7Q+KwLbUO8puL1igZaY7MdDDUQpmBcLRJN0BQnDFMMhPs9rF3MdwPzy3m3LIaNYPjAukyyKmSdRvbhKFjKGEu8tfxheKFh8a+nC3PClhcL2zyOT6B6PyEmpi2azYICFWK3iOiQqMOUgWc6tEPm2SwPVMCEaxSW+JZvSDHxEKe1AN4mPYdnl8ZPFIV+AwGIACcpQHaljHHaxzglc4dWCuY2A1My7YwObiFEa+f9OnjSvKeAOcneip/rJXG1nVBzuIBzrdjooIDmjTD0PbbfIdpystCEL78+/nkolXeq0qyPY0feK/HstOJrNgYud47lKfSkWGE9T6TB6XC0bdJCjzdfaOltXbJ/b0IrcRGQ7ZMOVdNtxdszRkKXLmGjc/lrwuJKHZlf2dA6pv1fgAzO/UEApyZ92L2KSP7G85oCyjLfUmKNCVpTWvrdJtAiLBScMBzL8RLmXRFXfjbH5Sjw8Ru9dBlrDnQtuoQijvmiTfLr2JfUdwwkz2opwfA49GseS0URByvbfDS0R3Pzq07TZlrwNosCebdUeag3Sv6SQSMxWc7EAbEGZnqEYzHtSFqVsHLw3+xnCYlZAXOOf2TwtCUQIg11El7C88tyOJtPP6T/A== 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: 9d714695-4776-47dd-4d6b-08d860532477 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2020 06:29:08.2146 (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: blhzRb3XC/6CoerFwrZxnnj2zTKRm1LEHWDFcZNVvIe4SGT8e6pLoDiB/Fh3vQwoKbCD3WXtfmkYKaZWK28dKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2841 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:58 PM > To: devel@edk2.groups.io > Cc: Liang, MingyueX ; Liming Gao > ; Chen, Christine > Subject: [PATCH] BaseTools: Normalize case of pathname when evaluating > Macros. >=20 > From: Mingyue Liang >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2880 >=20 > Currently, When doing the Incremental build, the directory macros extende= d > to absolute path in output Makefile, which is inconsistent with the outpu= t of > Clean build. >=20 > When we do macro replacement, we can't replace macro due to inconsistent > path case, which results in inconsistent display of incremental build and= clean > build in makefile.Therefore, the path is converted to achieve the correct > macro replacement. >=20 > Signed-off-by: Mingyue Liang > Cc: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > --- > BaseTools/Source/Python/AutoGen/GenMake.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py > b/BaseTools/Source/Python/AutoGen/GenMake.py > index 0314d0ea34..b04d3f5436 100755 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -786,8 +786,10 @@ cleanlib: >=20 > def ReplaceMacro(self, str): > for Macro in self.MacroList: > - if self._AutoGenObject.Macros[Macro] and > self._AutoGenObject.Macros[Macro] in str: > - str =3D str.replace(self._AutoGenObject.Macros[Macro], '= $(' + Macro > + ')') > + if self._AutoGenObject.Macros[Macro] and > os.path.normcase(self._AutoGenObject.Macros[Macro]) in > os.path.normcase(str): > + replace_dir =3D > str[os.path.normcase(str).index(os.path.normcase(self._AutoGenObject.Ma > cros[Macro])): os.path.normcase(str).index( > + os.path.normcase(self._AutoGenObject.Macros[Macro]))= + > len(self._AutoGenObject.Macros[Macro])] > + str =3D str.replace(replace_dir, '$(' + Macro + ')') > return str >=20 > def CommandExceedLimit(self): > -- > 2.28.0.windows.1