From 0f66152d72d979ef7ea040b552d50a80c596cc72 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Thu, 22 Jun 2023 15:01:35 -0400
Subject: [PATCH] build.py: allow initialization without installing pre-commit
hook
Gitlab: #1219
Change-Id: I5a2e2099d6ad1b551e2d744ffbf800b79c36a821
---
build.py | 2 +-
extras/scripts/format.py | 32 +++++++++++++++++---------------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/build.py b/build.py
index ab5abcd02..4ad21e899 100755
--- a/build.py
+++ b/build.py
@@ -329,7 +329,7 @@ def run_init(args):
# The client submodule has QML files, so we need to run qmlformat on it,
# and thus need to supply the Qt path.
execute_script([f'{format_script} --install {client_hooks_dir}'
- f' --qt {args.qt}' if args.qt else ''],
+ f' --qt {args.qt}'],
{"path": client_hooks_dir})
# The daemon submodule has no QML files, so we don't need to run
diff --git a/extras/scripts/format.py b/extras/scripts/format.py
index ba74ecb0f..487db0e91 100755
--- a/extras/scripts/format.py
+++ b/extras/scripts/format.py
@@ -22,7 +22,7 @@ import shutil
from platform import uname
CFVERSION = "9"
-CLANGFORMAT = ""
+CLANGFORMAT = None
QMLFORMAT = None
@@ -138,27 +138,29 @@ def main():
args = parser.parse_args()
if args.type in ["cpp", "both"]:
- if not command_exists("clang-format-" + CFVERSION):
- if not command_exists("clang-format"):
- print("Required version of clang-format not found")
- sys.exit(1)
- else:
- CLANGFORMAT = "clang-format"
- else:
- CLANGFORMAT = "clang-format-" + CFVERSION
+ if command_exists("clang-format-" + CFVERSION):
+ CLANGFORMAT = "clang-format-" + CFVERSION
+ elif command_exists("clang-format"):
+ CLANGFORMAT = "clang-format"
+
+ if CLANGFORMAT is not None:
print("Using source formatter: " + CLANGFORMAT)
+ else:
+ print("clang-format not found. can't format source files")
if args.qt is not None and args.type in ["qml", "both"]:
global QMLFORMAT # pylint: disable=global-statement
QMLFORMAT = find_qmlformat(args.qt)
-
- if QMLFORMAT is not None:
- print("Using qmlformatter: " + QMLFORMAT)
- else:
- print("No qmlformat found, can't format QML files")
+ if QMLFORMAT is not None:
+ print("Using qmlformatter: " + QMLFORMAT)
+ else:
+ print("qmlformat not found, can't format QML files")
if args.install:
- install_hook(args.install, args.qt)
+ if CLANGFORMAT is not None or QMLFORMAT is not None:
+ install_hook(args.install, args.qt)
+ else:
+ print("No formatters found, skipping hook install")
sys.exit(0)
src_files = get_files([".cpp", ".cxx", ".cc", ".h", ".hpp"],
--
GitLab