From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web08.37218.1656293001264331540 for ; Sun, 26 Jun 2022 18:23:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=JS8Z/esn; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: yuwei.chen@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656293001; x=1687829001; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ONmhJxT9/a0yTmcBLxdO9Y2Vxyv6lutGMZs9IKEBzDI=; b=JS8Z/esnU74cQiuI6EMUkrvqdwzuDd1a63MKdbd6VHgNAiIxsEYAaSLD WWurF45zX15nwSen1X7xtbU8T8UGdZZ1QABmfI9sZEY5RUxbmzi5u24IZ MrWHIsO15sYR+FmOuiOgOV65nLDe9XzDV/EA+XJwLeBbM71idJJFxxkO9 uskClLeFgFE2eG8Yx/YrF61kQ1oUlI8tTXGZGLfvRcXWLbHrAfCt1rQ+d 4HmUkqzjKeB/Io7/T3sMUQVbZ28cP1WZc8ATBM1CkVJb4oac+svGTi5dv PsNG2pCbpAXdrgsSpRcEUP/MjAcyUzxEUofBuYY5XnEGOaC24Zji90NRb A==; X-IronPort-AV: E=McAfee;i="6400,9594,10390"; a="261136730" X-IronPort-AV: E=Sophos;i="5.92,225,1650956400"; d="scan'208";a="261136730" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2022 18:23:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,225,1650956400"; d="scan'208";a="539910975" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga003.jf.intel.com with ESMTP; 26 Jun 2022 18:23:20 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) 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.2308.27; Sun, 26 Jun 2022 18:23:20 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Sun, 26 Jun 2022 18:23:19 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Sun, 26 Jun 2022 18:23:19 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.43) 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.2308.27; Sun, 26 Jun 2022 18:23:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ejk0e+I+fXbCRDCahPfi9/uDva6kCa6t8sNCe9hMvgVvdQVr0sp7aQBJCKwAQUZL0+jaRHOEn44ldTfcVya90HsmsvRjQsTivFbKVyf7Hlg+M+aNq5X2MGrh9zwpq6Rn77pvRFTxom5VJtKh3B6k0wSI2Hw/egPmxs8GNnVP39MhGvVIuxOrs9FSz8RbzfWc54/1264JxfBTStMPnTvMy9IlD2q9L5FozQWN0LM0C7WejE5WggTzJzx7PDwba48Z0QVFTCmpczrwhOGjhjoulEP2z4NnXxNTsXocCT+BjthPEPHq0LNX/9mli65ihqJddp95h7/0jYcTqZgajm4bcQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VCNjSW92bf6+MnSJDkCRh8vjvaOnrKI6kuvxuURBB/M=; b=Q8tohZ2J7dwRU7dkEnmR1kxZGAyzZbJxgMaHU8DpDnUTBGswI0R2ewglT5+mnTBS90J3J+CkgmmgEQO4On+BkWLBDeGBH1M9kMQiOtkZkKJz5jW3EsTD7a3cfrHrZHcrHzI8SWypmDaJPPHbGUJyaOKpRJL4qAv4XgUanYCYtW9Lj/ZsaW2oZmCJFaOGslcR77BlReC2IBkjKiOu1s4TMJaHIy7NkIVrVOhOMtRecH4symMK7gLSALTc9XArU8KwWZmWkXzj0mHfKezDmIKevpLoXD1mbLoENKmpT2rRRcOYhOnAjrWMTHL8s+6lyjIWLWwxazuWqTs1UHus0mHSZw== 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 Received: from MW5PR11MB5906.namprd11.prod.outlook.com (2603:10b6:303:1a0::21) by MW3PR11MB4620.namprd11.prod.outlook.com (2603:10b6:303:54::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Mon, 27 Jun 2022 01:23:17 +0000 Received: from MW5PR11MB5906.namprd11.prod.outlook.com ([fe80::2d9a:578f:afd5:462d]) by MW5PR11MB5906.namprd11.prod.outlook.com ([fe80::2d9a:578f:afd5:462d%7]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 01:23:17 +0000 From: "Yuwei Chen" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [Patch] BaseTools: Fix the GenMake bug for .cpp source file Thread-Topic: [Patch] BaseTools: Fix the GenMake bug for .cpp source file Thread-Index: AQHYiFIXcJzsyuNMY0uUgyUG0TZ4xq1ieEcQ Date: Mon, 27 Jun 2022 01:23:17 +0000 Message-ID: References: <20220625051140.931-1-bob.c.feng@intel.com> In-Reply-To: <20220625051140.931-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.500.17 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b09fe2c2-0314-4e48-7bc0-08da57db9d74 x-ms-traffictypediagnostic: MW3PR11MB4620:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: l4Hw5dcKQT3gedVRykDcctGXOG/2DeoCQdhwT0lBTpkK0NcHnOq8zJ6Eq/cEphZr3ie+ZuzQN32Ho/IWcRUXS4qG8eH+qZYc3E26UCuKHGWfzw/cr1Tw5XdhZFHNvQckWwkq0SYBo9R7k/mYQWUI4i4u0ZW/gzL1thUd6qK0mDjZzs2fjH6UimUtVK6rPLJIZ3ExvV54igtfogM/KemBu8P5Jz1qqCvypuG2qUgZItyB+dy9bpXB2FnXORzxxhkaw2t0SItyf0Pc+BYkTRCM9mqUb8A/3KHVdwMvSck0CDy6g/KhpLJUe0Oxc7F861ELJBCtqup0d72QmlUyIyFAZ43pPwnzmbfT1VTNVWBdHCnyUYkhJGr3vfw3hLzQK3R5M9iM42c+REGxHl3/PBSnVlTq5xz6nNzeYmg/Lsf2USBIPk1nhfwEVmNbznfyjS4WogjqTU06oOkEficT2+BW5SytK+f6WoetF1M7g0Vfc28t0RDBRHLvLxMl8sW3x7sN3cU601e3AN8Oq+0BnEv20IVPaX98lQ3ZYHt/keQMSEtCuf9bbadrIPaPA+1Ya6XauI+99C1nXyqF1WlPrGbTSmNuxIBH1n8PvcP2SbHo19bj3rsLGoSHiKv3hmBa79ZDQBf4+uVqdSRawYtBN5VTsc5KoPrhv9+ISffh7CdQ1ik3loi/s1cVUa2yvf8JvmXxfC/tFnbAWOMkq3Gf3Z71gso29sfanRU5zBa+dEFbcl8ksculErDVtYGrlKVEGOb3gCIocCCbY7rbCvJvlbeCf9XfC47lcnpEBnDYwcsB4iyOZGGKAk6qbZ9ziPDPw9z5 x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW5PR11MB5906.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(346002)(136003)(366004)(396003)(376002)(4326008)(86362001)(76116006)(6506007)(26005)(8676002)(53546011)(9686003)(7696005)(64756008)(66446008)(66556008)(38070700005)(71200400001)(8936002)(66476007)(52536014)(66946007)(122000001)(478600001)(55016003)(83380400001)(82960400001)(33656002)(41300700001)(110136005)(5660300002)(38100700002)(2906002)(316002)(186003)(142923001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?r3Kqym4VIAHyKiee6HwN+rvxBtT7EPaw9Gep7WELz5euBP84WoW/qKbDA55/?= =?us-ascii?Q?DcUUDSkS4XakPiUU0t2x/nq1lM4VYzRlsHPsRuu8rNgO9Q0QpB24knX/+F3f?= =?us-ascii?Q?BnohbQlqifyJUOTq8cQYSyuwv3BD0964vNkoUsKO9w2uwN8v0xPO2D9nSUNx?= =?us-ascii?Q?0SVthGbnEQa5vNEeL+7VZw+xsaNmVouNoK9v7fEiP6DKHoK27P9IBJEw3kFn?= =?us-ascii?Q?XaD4uva6F4NUWDjSS6KAslN5aMehG1lmyiWlz4g31wuQcGK8FYVzWOmbzCP+?= =?us-ascii?Q?jcZVv6v4TzVFCFz/fKX6a+pD9mo5FZyQ6eRvEej0o3WGp1+ulz/aeifxmwiz?= =?us-ascii?Q?jazesIAldLIc65D6cCHGXqZ/wlI+FcgGSzRm6s71SgFaP9PaAnJR4TYjyVGD?= =?us-ascii?Q?S+U7WGrEROc3FXcDY1yB+R2vmDzR9MClVbYj6v50oWcbajC/ukEW9/IsnMkj?= =?us-ascii?Q?B+h9uUFd9kEConEZKHS6L02jtZHLQhFHrn2VQV9EBXZoMcec7MRnCnzrkxuK?= =?us-ascii?Q?GE258sc1Nd0aBfsybywURpJxARPHJQz3Kaqp6QrEmp2KH0qqdpPuedmxRtou?= =?us-ascii?Q?eVokz47G+QMoyU8RB3mBwDCQlMCIdjsr3y40ZPU4lp4BHIByhccGczk2rx4P?= =?us-ascii?Q?dB3SnobVlyaGJgMY2KaoB2irvgINU8ayQvFfgCzbXJBNlofU677g/WVfzlra?= =?us-ascii?Q?Ruf+6mj9ckK1yMA4qsXCUGGlp0G/y4BHUmmM8OWq2mmm3clPt+raWDLZhdig?= =?us-ascii?Q?+7OBj1ebhULrWrLq+k+DbY+1DHvMfV26pdGXimFUdJCqlF07qVMo/TVfJ4Us?= =?us-ascii?Q?duvQhLZ/7glaErHTI6EdeBkjQ63O+GpE2trZz4Z3xVdYWSGxm98hu6q1jJg3?= =?us-ascii?Q?lk1KcuWEtpiC1m3Kno+lcYc4NP3inGN7iKGRz1EekkpveFiEbSnse5TCTvRk?= =?us-ascii?Q?28Z/5vguW2/rq0JWhF8sOw8Qn3lIz64W9MfydJf55w03SjyZHuQAn8WHKMRe?= =?us-ascii?Q?/ipEXQ2WmSfu0EGLQ5htcT/sSCEhsh8J75p0JMCtvQA+KgrweClLgnzsO84j?= =?us-ascii?Q?/RiUz0ZOLtwsdkxebbCsGGVKiZbpFcVmmaUTu9nKn4KNKSnBxJfg+D176XCr?= =?us-ascii?Q?z7iFGZFu/lEW98+1+Xf/8i0Ulb0RLlUOf8HWVdyE52n5kfbmAGNxZGFbeXCd?= =?us-ascii?Q?5dTEGG0GItMhoPV6FOpCSO7hHSy8ysGolQuWEQv0nOZ2+7abL4iGt1MMLouG?= =?us-ascii?Q?vcm3/lAVsa8hx/98SIFLPMdeBJtnZ2Vnvy1zXTrAjMo5vJ3tUuWNF6zRyP2P?= =?us-ascii?Q?u7z61/bII0kOIGFIeVHq3l8EzHS6hYICVALo2A3esMIVDulVEl4TrODcv9Za?= =?us-ascii?Q?EBmEtee5p1ro+0F6ED1o3SDavHTEhN1yFFz+Aua44/AR1rAvAmBLvvSxxuH2?= =?us-ascii?Q?0G7vPbclEGgONtOH5AwOYrgVOBndM2p1JtTssO+7YqtQ4L/T0YMehBkpYuEZ?= =?us-ascii?Q?qVq0WhzSnE7I0yo75wnydXP5viVRmr5tY2YihoX47hhKmzEpk3d4fIUbc9/x?= =?us-ascii?Q?JdNEWmNNiIZ8YCRt4Y5j68oreu3lghAAyKP5xEdm?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5906.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b09fe2c2-0314-4e48-7bc0-08da57db9d74 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jun 2022 01:23:17.7145 (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: JdywOZiPPjI8AAORhwHGYVkSAoig63hVBGISS7x3HCHWDOL6mil7SyDXiohKMSMffBQzorUo0VmcxbHSjiNgSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4620 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: Saturday, June 25, 2022 1:12 PM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming > ; Chen, Christine > Subject: [Patch] BaseTools: Fix the GenMake bug for .cpp source file >=20 > From: "Feng, Bob C" >=20 > 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. >=20 > This patch is to fix this bug. >=20 > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > --- > BaseTools/Source/Python/AutoGen/GenMake.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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[CmdSig= n] =3D "%s %s" % > (CmdTargetDict[CmdSign], SingleCommandList[-1]) > CmdTargetDict[CmdSign].append(SingleCommandList[-1]) = Index =3D > CommandList.index(Item) CommandList.pop(Index)- = if > SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLASH, > CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])):+ Ba= seName =3D > SingleCommandList[-1].rsplit('.',1)[0]+ if > BaseName.endswith("%s%s" % (TAB_SLASH, > CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])): = Cpplist =3D > CmdCppDict[T.Target.SubDir] Cpplist.insert(0, '$(= OBJLIST_%d): ' % > list(self.ObjTargetDict.keys()).index(T.Target.SubDir)) > source_files =3D CmdTargetDict[CmdSign][1:] sourc= e_files.insert(0, > " ") if len(source_files)>2:-- > 2.29.1.windows.1