From 937d8054c4ddff99c6ec8ad99b3d62e50f240d17 Mon Sep 17 00:00:00 2001 From: Manan Garg <92792271+Coder-Manan@users.noreply.github.com> Date: Thu, 26 Jan 2023 14:47:05 +0530 Subject: [PATCH 1/3] add v15 of clang-format --- githooks/pre-commit-clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/githooks/pre-commit-clang-format b/githooks/pre-commit-clang-format index 3f94e5ecb..7c76ce8e2 100755 --- a/githooks/pre-commit-clang-format +++ b/githooks/pre-commit-clang-format @@ -24,7 +24,7 @@ RECOMMENDED_CLANG_FORMAT_MAJOR="11" function find_clang_format() { - for version in 11 12 13 14; do + for version in 11 12 13 14 15; do program=`which clang-format-$version 2>/dev/null` if [ ! -z "$program" ]; then echo "$program" From 2c77c37991b27b80953c2152f3ca6a988c7eaa40 Mon Sep 17 00:00:00 2001 From: Manan Garg Date: Sun, 2 Apr 2023 10:19:55 +0530 Subject: [PATCH 2/3] port find_clang_format to bash --- githooks/pre-commit-clang-format.ps1 | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 githooks/pre-commit-clang-format.ps1 diff --git a/githooks/pre-commit-clang-format.ps1 b/githooks/pre-commit-clang-format.ps1 new file mode 100644 index 000000000..34e9de1e7 --- /dev/null +++ b/githooks/pre-commit-clang-format.ps1 @@ -0,0 +1,13 @@ +$RECOMMENDED_CLANG_FORMAT_MAJOR="11" + +function Get-ClangFormatVersion { + $program = $(Get-Command clang-format -ErrorAction SilentlyContinue) + $clangFormatVersion = $program.Version + $program = $program.Source + $clangMajorVersion = $clangFormatVersion.Split(" ")[2].Split(".")[0] + if ($clangMajorVersion -ge $RECOMMENDED_CLANG_FORMAT_MAJOR) { + return $program + } +} + +$CLANG_FORMAT = Get-ClangFormatVersion \ No newline at end of file From 94271e3d599cc633f7d0919a05b48a66a92370e1 Mon Sep 17 00:00:00 2001 From: Manan Garg Date: Sun, 2 Apr 2023 10:42:59 +0530 Subject: [PATCH 3/3] fix error in ported find_clang_format --- githooks/pre-commit-clang-format.ps1 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/githooks/pre-commit-clang-format.ps1 b/githooks/pre-commit-clang-format.ps1 index 34e9de1e7..4a64d4683 100644 --- a/githooks/pre-commit-clang-format.ps1 +++ b/githooks/pre-commit-clang-format.ps1 @@ -1,12 +1,14 @@ $RECOMMENDED_CLANG_FORMAT_MAJOR="11" function Get-ClangFormatVersion { - $program = $(Get-Command clang-format -ErrorAction SilentlyContinue) - $clangFormatVersion = $program.Version - $program = $program.Source - $clangMajorVersion = $clangFormatVersion.Split(" ")[2].Split(".")[0] - if ($clangMajorVersion -ge $RECOMMENDED_CLANG_FORMAT_MAJOR) { - return $program + $program = $(Get-Command clang-format.exe -ErrorAction SilentlyContinue) + if ($program) { + $version = & $program.Source --version + $clangFormatVersion = $version.Split(" ")[2] + $clangMajorVersion = $clangFormatVersion.Split(".")[0] + if ($clangMajorVersion -ge $RECOMMENDED_CLANG_FORMAT_MAJOR) { + return $clangMajorVersion + } } }