From nobody Wed May 1 01:39:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+90751+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90751+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1656133907490596.0454293780286; Fri, 24 Jun 2022 22:11:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id W9LxYY1788612xk1H2gYM2N9; Fri, 24 Jun 2022 22:11:47 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.16662.1656133906234214561 for ; Fri, 24 Jun 2022 22:11:46 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10388"; a="342836554" X-IronPort-AV: E=Sophos;i="5.92,221,1650956400"; d="scan'208";a="342836554" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2022 22:11:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,221,1650956400"; d="scan'208";a="645582615" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.59]) by fmsmga008.fm.intel.com with ESMTP; 24 Jun 2022 22:11:44 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: "Feng, Bob C" , Liming Gao , Yuwei Chen Subject: [edk2-devel] [Patch] BaseTools: Fix the GenMake bug for .cpp source file Date: Sat, 25 Jun 2022 13:11:40 +0800 Message-Id: <20220625051140.931-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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: 68ItdZlbMDtnjPvlDHViNMGNx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1656133907; bh=RmtrFwyuM9WBEPOs8MvErpKOwc4ySi5C08785Ihwcr4=; h=Cc:Date:From:Reply-To:Subject:To; b=m0tRXr+Ea166pFrKOy8j3H0gFimC4ftI1PpsHL7qPgmRk8ghLQlrAR2mO2Yl8JnLY3R bOEoAjFZ0X6I0hFJ/cpCydaNZ2/eOfRc07TypRsKPXnFJ2MBUJ0UY9/EssVaDqcauHUcK ylcHrfS85pkrrGdRfEnGbj6ZM2th/9ZUxh0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1656133909439100002 Content-Type: text/plain; charset="utf-8" From: "Feng, Bob C" Build-rules.txt lists .cc and .cpp as supported file extensions. BaseTools commit 05217d210e introduce a regression issue that ignore the .cc and .cpp file type. This patch is to fix this bug. Signed-off-by: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Reviewed-by: Yuwei Chen --- BaseTools/Source/Python/AutoGen/GenMake.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index da406e6ff4..92c7bf0cda 100755 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1108,11 +1108,12 @@ cleanlib: else: # CmdTargetDict[CmdSign] =3D "%s %s" % (CmdTargetD= ict[CmdSign], SingleCommandList[-1]) CmdTargetDict[CmdSign].append(SingleCommandList[-1= ]) Index =3D CommandList.index(Item) CommandList.pop(Index) - if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLAS= H, CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])): + BaseName =3D SingleCommandList[-1].rsplit('.',1)[0] + if BaseName.endswith("%s%s" % (TAB_SLASH, CmdSumDict[C= mdSign[3:].rsplit(TAB_SLASH, 1)[0]])): Cpplist =3D CmdCppDict[T.Target.SubDir] Cpplist.insert(0, '$(OBJLIST_%d): ' % list(self.Ob= jTargetDict.keys()).index(T.Target.SubDir)) source_files =3D CmdTargetDict[CmdSign][1:] source_files.insert(0, " ") if len(source_files)>2: --=20 2.29.1.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 (#90751): https://edk2.groups.io/g/devel/message/90751 Mute This Topic: https://groups.io/mt/91979266/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-