[Patch] BaseTools: Fix the GenMake bug for .cpp source file

[Patch] BaseTools: Fix the GenMake bug for .cpp source file

[Bob Feng]

From: "Feng, Bob C" <bob.c.feng@intel.com>

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 <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
---
 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] = "%s %s" % (CmdTargetDict[CmdSign], SingleCommandList[-1])
                         CmdTargetDict[CmdSign].append(SingleCommandList[-1])
                     Index = CommandList.index(Item)
                     CommandList.pop(Index)
-                    if SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLASH, CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])):
+                    BaseName = SingleCommandList[-1].rsplit('.',1)[0]
+                    if BaseName.endswith("%s%s" % (TAB_SLASH, CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])):
                         Cpplist = CmdCppDict[T.Target.SubDir]
                         Cpplist.insert(0, '$(OBJLIST_%d): ' % list(self.ObjTargetDict.keys()).index(T.Target.SubDir))
                         source_files = CmdTargetDict[CmdSign][1:]
                         source_files.insert(0, " ")
                         if len(source_files)>2:
-- 
2.29.1.windows.1

Re: [Patch] BaseTools: Fix the GenMake bug for .cpp source file

[Yuwei Chen]

Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>

> -----Original Message-----
> From: Feng, Bob C <bob.c.feng@intel.com>
> Sent: Saturday, June 25, 2022 1:12 PM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> Subject: [Patch] BaseTools: Fix the GenMake bug for .cpp source file
> 
> From: "Feng, Bob C" <bob.c.feng@intel.com>
> 
> 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 <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> ---
>  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] = "%s %s" %
> (CmdTargetDict[CmdSign], SingleCommandList[-1])
> CmdTargetDict[CmdSign].append(SingleCommandList[-1])                     Index =
> CommandList.index(Item)                     CommandList.pop(Index)-                    if
> SingleCommandList[-1].endswith("%s%s.c" % (TAB_SLASH,
> CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])):+                    BaseName =
> SingleCommandList[-1].rsplit('.',1)[0]+                    if
> BaseName.endswith("%s%s" % (TAB_SLASH,
> CmdSumDict[CmdSign[3:].rsplit(TAB_SLASH, 1)[0]])):                         Cpplist =
> CmdCppDict[T.Target.SubDir]                         Cpplist.insert(0, '$(OBJLIST_%d): ' %
> list(self.ObjTargetDict.keys()).index(T.Target.SubDir))
> source_files = CmdTargetDict[CmdSign][1:]                         source_files.insert(0,
> " ")                         if len(source_files)>2:--
> 2.29.1.windows.1