[PATCH v2 1/1] BaseTools/Scripts/PatchCheck.py: Improve check for Makefiles

[PATCH v2 1/1] BaseTools/Scripts/PatchCheck.py: Improve check for Makefiles

[Rebecca Cran]

When checking for Makefiles, also check for *.makefile: this allows
{header,footer,app,lib}.makefile in BaseTools/Source/C/Makefiles to be
detected and avoid having PatchCheck.py complain about tab characters.

Also, change the check for "Makefile" to be case-insensitive since there
are some Makefiles named 'makefile' instead of 'Makefile'.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Scripts/PatchCheck.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
index fcdabfc8acea..241467f10ea5 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -383,7 +383,8 @@ class GitDiffCheck:
                     self.force_crlf = False
                     self.force_notabs = False
                 if os.path.basename(self.filename) == 'GNUmakefile' or \
-                   os.path.basename(self.filename) == 'Makefile':
+                   os.path.basename(self.filename).lower() == 'makefile' or \
+                   os.path.splitext(self.filename)[1] == ".makefile":
                     self.force_notabs = False
             elif len(line.rstrip()) != 0:
                 self.format_error("didn't find diff command")
-- 
2.34.1

Re: [PATCH v2 1/1] BaseTools/Scripts/PatchCheck.py: Improve check for Makefiles

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>


> -----Original Message-----
> From: Rebecca Cran <rebecca@bsdio.com>
> Sent: Friday, March 24, 2023 12:17 PM
> To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Subject: [PATCH v2 1/1] BaseTools/Scripts/PatchCheck.py: Improve check for Makefiles
> 
> When checking for Makefiles, also check for *.makefile: this allows
> {header,footer,app,lib}.makefile in BaseTools/Source/C/Makefiles to be
> detected and avoid having PatchCheck.py complain about tab characters.
> 
> Also, change the check for "Makefile" to be case-insensitive since there
> are some Makefiles named 'makefile' instead of 'Makefile'.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  BaseTools/Scripts/PatchCheck.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
> index fcdabfc8acea..241467f10ea5 100755
> --- a/BaseTools/Scripts/PatchCheck.py
> +++ b/BaseTools/Scripts/PatchCheck.py
> @@ -383,7 +383,8 @@ class GitDiffCheck:
>                      self.force_crlf = False
>                      self.force_notabs = False
>                  if os.path.basename(self.filename) == 'GNUmakefile' or \
> -                   os.path.basename(self.filename) == 'Makefile':
> +                   os.path.basename(self.filename).lower() == 'makefile' or \
> +                   os.path.splitext(self.filename)[1] == ".makefile":
>                      self.force_notabs = False
>              elif len(line.rstrip()) != 0:
>                  self.format_error("didn't find diff command")
> --
> 2.34.1