From: Kirill Yukhin <kyukhin@tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH 3/5] build: add clang-format rules Date: Fri, 30 Oct 2020 14:43:50 +0300 [thread overview] Message-ID: <d97bcf32532431ea669b31bde04fe22a2fae27e3.1604057827.git.kyukhin@tarantool.org> (raw) In-Reply-To: <cover.1604057827.git.kyukhin@tarantool.org> In-Reply-To: <cover.1604057827.git.kyukhin@tarantool.org> This patch introduces support of `make format-set` and `make format-check` commands which invoes Clang v'11 formatter. --- CMakeLists.txt | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 512f50e..cd72e15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,11 +20,13 @@ include(FindPackageMessage) include(ExternalProject) find_program(ECHO echo) -find_program(CAT cat) find_program(BASH bash) +find_program(CAT cat) +find_program(CLANG_FORMAT clang-format-11) +find_program(CTAGS ctags) +find_program(FIND find) find_program(GIT git) find_program(LD ld) -find_program(CTAGS ctags) find_program(LUACHECK luacheck ENV PATH) # Define PACKAGE macro in tarantool/config.h @@ -164,6 +166,38 @@ add_custom_command(TARGET luacheck COMMENT "Perform static analysis of Lua code" ) +if(CLANG_FORMAT) + # + # Enable 'make format-set' target. + # + add_custom_target(format-set + COMMAND ${FIND} "${PROJECT_SOURCE_DIR}/src/box" + -iname "*.h" -o -iname "*.c" -o -iname "*.cc" |grep -v sql + |xargs ${CLANG_FORMAT} -i + COMMENT "Perform code style update w/ clang-format over code base" + ) + + # + # Enable 'make format-check' target. + # + add_custom_target(format-check + COMMAND ${FIND} "${PROJECT_SOURCE_DIR}/src/box" + -iname "*.h" -o -iname "*.c" -o -iname "*.cc" + |grep -v sql + |xargs ${CLANG_FORMAT} -output-replacements-xml + |tee + ${CMAKE_BINARY_DIR}/check_clang_format_file.txt | + grep -c "replacement " | tr -d "[:cntrl:]" && echo + " replacements necessary" + COMMAND ! grep -c "replacement " + ${CMAKE_BINARY_DIR}/check_clang_format_file.txt > + /dev/null + COMMENT "Check code style w/ clang-format over code base" + ) +else() + message(WARNING "Clang formatter v11 (clang-format-11) wasn't found") +endif() + if (WITH_JEPSEN) ExternalProject_Add( jepsen-tests -- 1.8.3.1
next prev parent reply other threads:[~2020-10-30 11:44 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-30 11:43 [Tarantool-patches] [PATCH 0/5] Add clang format Kirill Yukhin 2020-10-30 11:43 ` [Tarantool-patches] [PATCH 1/5] clang-format: guard various declarations Kirill Yukhin 2020-11-08 15:09 ` Vladislav Shpilevoy 2020-10-30 11:43 ` [Tarantool-patches] [PATCH 2/5] Add .clang-format for src/box/ Kirill Yukhin 2020-10-30 11:43 ` Kirill Yukhin [this message] 2020-11-08 15:09 ` [Tarantool-patches] [PATCH 3/5] build: add clang-format rules Vladislav Shpilevoy 2020-10-30 11:43 ` [Tarantool-patches] [PATCH 4/5] gitlab-ci: add code style check Kirill Yukhin 2020-10-30 11:43 ` [Tarantool-patches] [PATCH 5/5] Apply Clang formatter Kirill Yukhin 2020-10-30 13:42 ` Konstantin Osipov 2020-10-30 23:04 ` Vladislav Shpilevoy 2020-11-01 21:40 ` Konstantin Osipov 2020-11-02 7:35 ` Kirill Yukhin 2020-11-02 21:05 ` Vladislav Shpilevoy 2020-11-10 14:16 ` Kirill Yukhin 2020-11-10 20:38 ` Vladislav Shpilevoy 2020-11-11 8:23 ` Kirill Yukhin 2020-11-08 15:11 ` Vladislav Shpilevoy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=d97bcf32532431ea669b31bde04fe22a2fae27e3.1604057827.git.kyukhin@tarantool.org \ --to=kyukhin@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 3/5] build: add clang-format rules' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox