From nobody Mon May 6 11:33:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+65527+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+65527+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1600858677; cv=none; d=zohomail.com; s=zohoarc; b=guYU4llnM6rCgltxUHDQz5vLxD1DhxuBk3zdUJluSt/41T2okPJuoT9Xsqm8bq5Due2k+B6UCb730VpQohtNDbYBYgRv5HhegUVYKa6RWUAvZW6lmBs1bCjPjY4SI0NV6/0QLOWk90rVam5/XTWD+1/uOHfRFLto5/tga/u3hso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600858677; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=dDDgMW+R8TmHRuYfU621jx2F1DAnXv4dSqbTUUZHzaM=; b=HGfEArQCnOV4M0ZfAoHxbC93Yh+UIOmLPjz7f0i7iZSrp7x5MUQZ5tvfqyLJHqT6O18WjJHgt6xL/0NAZd3yGnt+sG4sJIeWvqz03EY5ebMu3a3tYB6stW9TJfiTh427TE+G4w/XyT9iwVCCXjfw3nwlcRspDmTwJY/otHk4WLs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+65527+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 16008586770421013.0484607847098; Wed, 23 Sep 2020 03:57:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qE41YY1788612xgmI1GqoUwB; Wed, 23 Sep 2020 03:57:55 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.10660.1600858674626219321 for ; Wed, 23 Sep 2020 03:57:54 -0700 IronPort-SDR: 0Bc2lbkuA8FlQYu2fM70jB8I2HmzOxifBLbztH8IWkj42KhF/F221RIGHIZQPknfF/f1zpBzPT sN1B5N5KmueQ== X-IronPort-AV: E=McAfee;i="6000,8403,9752"; a="178928348" X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="178928348" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2020 03:57:53 -0700 IronPort-SDR: Af621OrRbkYQcBqjyp+C/kkKMF+uXEGXTSud/x11r0hMeq2/pzGpAwhv4pTaabazuS9GiviL0F hgS+Kgv0N0ag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,293,1596524400"; d="scan'208";a="347309995" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.66]) by FMSMGA003.fm.intel.com with ESMTP; 23 Sep 2020 03:57:52 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Mingyue Liang , Liming Gao , Yuwei Chen Subject: [edk2-devel] [PATCH] BaseTools: Normalize case of pathname when evaluating Macros. Date: Wed, 23 Sep 2020 18:57:32 +0800 Message-Id: <20200923105732.34648-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com X-Gm-Message-State: HLYE12t3N59kDyavqybUFjCGx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1600858675; bh=DsdKvI5s3J6jPZKDRUcj/IohZkTuvGg/VydYmKOcqsw=; h=Cc:Date:From:Reply-To:Subject:To; b=xBWexKTcFzQB+luXHJkuABiqF65cAMGLBVCPa9L50ZCcMGBJ+TWgz16R9W1iIEJgxaz PhguFytSSVRVqrEIZPdhalsk9XFAnlQMzYaC2FkBiPXz7WmZUrNAdyu2G56m2CeaY2Igt sA/yhsDO2KKyqGSm5utjqjGWlIFhh35gqcg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 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. Signed-off-by: Mingyue Liang Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Reviewed-by: 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.M= acros[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.no= rmcase(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): --=20 2.28.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#65527): https://edk2.groups.io/g/devel/message/65527 Mute This Topic: https://groups.io/mt/77032381/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-