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.9615.1600925266729073158 for ; Wed, 23 Sep 2020 22:27:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=PgOd53H9; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: bob.c.feng@intel.com) IronPort-SDR: 8OnnRhAxqufsB/zPFMOWL43Bb/3wLZo8MLHK/l82UnCFlMQtngrA6wtdWqSG0zWjO3kDU+SSvA 4yrkR4yGUh8Q== X-IronPort-AV: E=McAfee;i="6000,8403,9753"; a="141119947" X-IronPort-AV: E=Sophos;i="5.77,296,1596524400"; d="scan'208";a="141119947" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 22:27:46 -0700 IronPort-SDR: oz+0baKzZwn+pU8X2LJcRx5pvDds4igRMV6LLc1kQq69e+q8lQqrmiZ2YmZkdIBbeB15g3WZum L+3qS3V5HNng== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,296,1596524400"; d="scan'208";a="322843784" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by orsmga002.jf.intel.com with ESMTP; 23 Sep 2020 22:27:45 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) 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; Wed, 23 Sep 2020 22:27:42 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx609.amr.corp.intel.com (10.18.126.89) 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 22:27:42 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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 via Frontend Transport; Wed, 23 Sep 2020 22:27:42 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.101) 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; Wed, 23 Sep 2020 22:27:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LpYDhR+Ydrtjwthlp8noXZAt/EVSy/c4XZ1k+A0icg4Z+Wjn7P3KY0D0uyd31Gn9DbuqYR5P5qZg/CgNavyNt/t3amme5renu5nMLpgJpOHbcAcgur+5gBllw/lV2TcG2xsZYIIfpMpGIy6RgsmpDoOyCcpX+fzGlz0nIGaIU4s8biy45tUmFqlR0rZDm8C2xB5V2ajB6zwGcoFynUxig3NuB/hkA2YF4CS4c88oAvyCLqnovoJvukwImpEET1rAy8Pt/F0NcCy15hTnduUATwfyXfiw+UMEgesasT8KHbETzF4WHF9d9qzsla4R3riWm5jpzVJKKg4BsOF2JHBBew== 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=QmllrCX8b/6ca3xU+WRQ5vb+l+97/Olo/dLhHy01LEg=; b=djNK4t6LBW/hGINNDDAg/bsd3xCs88kNPX//2MG69jQpjnJCrxL2tb7iftZnk0JDb4v3H4tCRSqFUhE9BVW0Nx13wdLMM+Vf1QoCcnPm/fjGPdv4mpdnMlF2KsZp9jsdIEHbIdwE2VKYs2lAc02pXNEvEQI3UD0ZFwMfTR045uMDfkLE69KwxRzg85Yc4ZQEFgtLzZFk0eP3Cikm+t+CXGwnglYpve7j+jETampOVJC2sikU20y951CH6DLQTbEbeHHUK1MctSiUF34FRa13rDkGm/ROqb+jTjHlt6Wt+4gOKlawhD09iXmjD0yUEroCnoKuc5zKcNKZ7ZHggHZaMw== 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=QmllrCX8b/6ca3xU+WRQ5vb+l+97/Olo/dLhHy01LEg=; b=PgOd53H9RRYc6INyfYltveHBhvwrD+z+oyKSeoR42JOR46Y6bzJVLlQA+2fJYAv7xUvrx1VEbMH+8vHidmaaCB/0HoZ2DxvAczPr0lgSuZgNEhA8Cg6+OaCiUbK2VVtpxQGDDlateOMex5F1UyvBMk5lcbH7t1YKmiQt1r2gqyM= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB3801.namprd11.prod.outlook.com (2603:10b6:5:136::14) 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 05:27:39 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::88bc:d834:df24:ea90]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::88bc:d834:df24:ea90%6]) with mapi id 15.20.3412.020; Thu, 24 Sep 2020 05:27:39 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Feng, Bob C" CC: "Liang, MingyueX" , Liming Gao , "Chen, Christine" Subject: Re: [edk2-devel] [PATCH] BaseTools: Normalize case of pathname when evaluating Macros. Thread-Topic: [edk2-devel] [PATCH] BaseTools: Normalize case of pathname when evaluating Macros. Thread-Index: AQHWkZhy0Nif7KqM00icEPifz8kM8al3Q5nw Date: Thu, 24 Sep 2020 05:27:39 +0000 Message-ID: References: <1637647BAC077E32.15058@groups.io> In-Reply-To: <1637647BAC077E32.15058@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.36] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8eedc31d-4d67-4703-d9cf-08d8604a8dc3 x-ms-traffictypediagnostic: DM6PR11MB3801: 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: sgBkBHsFCxWGaTNDj6qHxyPkj8D+22/NSXqezQ7p4Ik8DcqVbB4MpuMTxi86pGSJ/8caVgdjgvT9xc+iJphj4JM2R0VfEFQd6Z67PbukPmZ03sWIYfn/T7ddXCIiej0XW92R7YWLMCTP3QuffElRngerKoj/3mt+ve1vEzlPLoCg3eObxaVfH0qrcCz2lkxV9eKYQaEg+SCYDwH66/pHqNrZiBm1XPWOv1Nhmo6txYOMxo3+G6wQ5Mw+OZuHbQCO9AmbUYg73IX1+bWBWhP7WLjiwvguQDFkUEm7YKPV3yLHWkbe3jcBH7kkIelG8ofy2/nd0A7OKJn9VdNZV3JoujqDg1cts+rbbrwh5odoT9lgh33/399Vw6FAnyfha9NZbKj7Gc2/lNDm9TVEHMHrtZbCPBgTIfrV658ah7H3/os9sLdBUUnF0ItGM82NWUK9 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)(39860400002)(346002)(366004)(376002)(136003)(396003)(8936002)(71200400001)(107886003)(478600001)(52536014)(83380400001)(66556008)(4326008)(76116006)(66946007)(64756008)(66446008)(7696005)(6506007)(66476007)(316002)(26005)(86362001)(8676002)(5660300002)(54906003)(55016002)(53546011)(33656002)(966005)(186003)(2906002)(9686003)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: tuD3lUjlUDh9QQusaCBGkmA6DEQimC1vm/6aYC/tpbXoxa+QK9uEg/dD2GUSviJ5G01KSNfpoCYFm+E69fE6pLGHu5foB5iHKXfryOClhsfkbEdc7ft7rccdiJYQ5+qlbanFuemWlRJTMEny+BEN2klJgoTmUW4tfoJ0LzsueG3YE2GlJx4mOH54hVvFpXSDCdeCMzYBKfLJMBCdR+y99/c4rDlqi7UGmy3mxZ8+QxfxMZEOWB46Wlh1Q+kLzwclQWzsBT2W8GzomQaAGOjMLXfIZpJ99X6nVBKNhRDid0mltGsjdDPCt3JJUW5F8hbKuTFk+vmVkLwtLeX1fs4h1CtmoLJVuWc/m4TOjUE4QDM3Q0Fqscfi1MJxi+eNZXckpnniYGcXvOJo29NsgTMFLbe8EfAH5uUFzMggZkXYnc+mc3gukxarZLXsTTXwcXz8put91blBDDZaKHSTYmjh0jddo6KWrpHQPt460wIAK/15uaA9UXkf/BlL2OIESKqEenJ/dbnkAGA9clInE59leF8gjAyWGRe3MCYlBSMW32YpG7IjxL8Z4fJDicwGgyMmkGKTLptssq8RPMjNmhuOfpPE2i+al/eSjpfSbTnWWhYqmTjyIJ+J/j1eGiESa76Tq+UqUr7hjWQQv8wUCijx3g== 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: 8eedc31d-4d67-4703-d9cf-08d8604a8dc3 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2020 05:27:39.4504 (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: pvERLiZy+OXqOcDunouat0N7BVMYW6XXRC4ovqcB5QuGX+XxDTLb0nt3HeR+VTPqHIGTfRM290fo5ymC/2VNOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3801 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: devel@edk2.groups.io On Behalf Of Bob Feng Sent: Wednesday, September 23, 2020 6:58 PM To: devel@edk2.groups.io Cc: Liang, MingyueX ; Liming Gao ; Chen, Christine Subject: [edk2-devel] [PATCH] BaseTools: Normalize case of pathname when e= valuating Macros. From: Mingyue Liang REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2880 Currently, When doing the Incremental build, the directory macros extended= to absolute path in output Makefile, which is inconsistent with the output= of Clean build. When we do macro replacement, we can't replace macro due to inconsistent p= ath case, which results in inconsistent display of incremental build and cl= ean build in makefile.Therefore, the path is converted to achieve the corre= ct macro replacement. 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(-) 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(sel= f._AutoGenObject.Macros[Macro]) in os.path.normcase(str): + replace_dir =3D str[os.path.normcase(str).index(os.path.n= ormcase(self._AutoGenObject.Macros[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