diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-07-24 18:47:54 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-07-24 18:47:54 +0200 |
commit | a25ce5d8fc994004ac847f8ae814e6a57329030a (patch) | |
tree | 044f30806f54d77129aaf9972551d8ffd6e8e83e | |
parent | 057de4e6b509e15c89f10158e1935ccdc063deaa (diff) | |
parent | 1ba99d242788b50b26b739d571d4866a6c2d0fed (diff) |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | hooks/README.md | 5 | ||||
-rwxr-xr-x | hooks/pre-commit | 25 |
3 files changed, 30 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d02c101..b442fc11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,10 +21,6 @@ if (NOT NRF5_SDK_PATH) message(FATAL_ERROR "The path to the NRF52 SDK must be specified on the command line (add -DNRF5_SDK_PATH=<path>") endif () -if(NOT USE_JLINK AND NOT USE_GDB_CLIENT AND NOT USE_OPENOCD) - set(USE_JLINK true) -endif() - if(USE_JLINK) if (NOT NRFJPROG) message(FATAL_ERROR "the path to the tool nrfjprog must be specified on the command line (add -DNRFJPROG=<path>") diff --git a/hooks/README.md b/hooks/README.md new file mode 100644 index 00000000..de8fc67b --- /dev/null +++ b/hooks/README.md @@ -0,0 +1,5 @@ +# Git hooks + +This directory contains Git hooks that simplify contributing to this repository. + +You can install them by copying the files into `.git/hooks` in the repository folder or by running `git config --local core.hooksPath hooks` diff --git a/hooks/pre-commit b/hooks/pre-commit new file mode 100755 index 00000000..5e10aa19 --- /dev/null +++ b/hooks/pre-commit @@ -0,0 +1,25 @@ +#!/bin/bash +if clang-format --version | grep -q 'version 11\.'; then + CLANG_FORMAT_EXECUTABLE="clang-format" +else + CLANG_FORMAT_EXECUTABLE="clang-format-11" +fi + +if ! command -v $CLANG_FORMAT_EXECUTABLE &> /dev/null +then + echo $CLANG_FORMAT_EXECUTABLE does not exist, make sure to install it + exit 1 +fi + +for FILE in $(git diff --cached --name-only) +do + if [[ "$FILE" =~ src/[A-Za-z0-9\ \-]+*\.(c|h|cpp|cc)$ ]]; then + echo Autoformatting $FILE with $CLANG_FORMAT_EXECUTABLE + $CLANG_FORMAT_EXECUTABLE -style=file -i -- $FILE + git add -- $FILE + elif [[ "$FILE" =~ src/(components|displayapp|drivers|heartratetask|logging|systemtask)/.*\.(c|h|cpp|cc)$ ]]; then + echo Autoformatting $FILE with $CLANG_FORMAT_EXECUTABLE + $CLANG_FORMAT_EXECUTABLE -style=file -i -- $FILE + git add -- $FILE + fi +done |