[Tarantool-patches] [PATCH luajit 3/4][v2] cmake: introduce target with codespell

Sergey Bronnikov sergeyb at tarantool.org
Wed Oct 11 22:33:35 MSK 2023


Added fixup patch (and force-pushed):

diff --git a/cmake/CodeSpell.cmake b/cmake/CodeSpell.cmake
index c4d3555d..475b9d4b 100644
--- a/cmake/CodeSpell.cmake
+++ b/cmake/CodeSpell.cmake
@@ -21,7 +21,6 @@ if (CODESPELL)
        ${CODESPELL}
          --ignore-words ${IGNORE_WORDS}
          --skip ${IGNORE_WORDS}
-        --ignore-words-list fpr
          --check-filenames
          ${CODESPELL_WHITELIST}
      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
diff --git a/tools/codespell-ignore-words.txt 
b/tools/codespell-ignore-words.txt
index ceeed47c..e1865caf 100644
--- a/tools/codespell-ignore-words.txt
+++ b/tools/codespell-ignore-words.txt
@@ -1,3 +1,3 @@
  mmaped
  isnt
-FPR
+fpr

On 10/11/23 19:52, Sergey Bronnikov wrote:
> From: Sergey Bronnikov <sergeyb at tarantool.org>
>
> The patch introduces a new CMake target: "LuaJIT-codespell", that
> spellchecks files specified in a whitelist by codespell [1].
>
> 1. https://github.com/codespell-project/codespell
> ---
>   CMakeLists.txt                   |  1 +
>   cmake/CodeSpell.cmake            | 36 ++++++++++++++++++++++++++++++++
>   test/CMakeLists.txt              |  1 +
>   tools/codespell-ignore-words.txt |  3 +++
>   4 files changed, 41 insertions(+)
>   create mode 100644 cmake/CodeSpell.cmake
>   create mode 100644 tools/codespell-ignore-words.txt
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index eebf3d6f..7ef10f2f 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -32,6 +32,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
>   include(LuaJITUtils)
>   include(SetBuildParallelLevel)
>   include(SetVersion)
> +include(CodeSpell)
>   
>   # --- Variables to be exported to child scopes ---------------------------------
>   
> diff --git a/cmake/CodeSpell.cmake b/cmake/CodeSpell.cmake
> new file mode 100644
> index 00000000..c4d3555d
> --- /dev/null
> +++ b/cmake/CodeSpell.cmake
> @@ -0,0 +1,36 @@
> +find_program(CODESPELL codespell)
> +
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/src/lj_mapi.c)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/src/lj_sysprof.c)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/src/lj_utils_leb128.c)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/src/lj_wbuf.c)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/src/luajit-gdb.py)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/src/luajit_lldb.py)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/test/CMakeLists.txt)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/test/tarantool-c-tests)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/test/tarantool-tests)
> +list(APPEND CODESPELL_WHITELIST ${PROJECT_SOURCE_DIR}/tools)
> +
> +set(IGNORE_WORDS ${PROJECT_SOURCE_DIR}/tools/codespell-ignore-words.txt)
> +
> +add_custom_target(${PROJECT_NAME}-codespell)
> +if (CODESPELL)
> +  add_custom_command(TARGET ${PROJECT_NAME}-codespell
> +    COMMENT "Running codespell"
> +    COMMAND
> +      ${CODESPELL}
> +        --ignore-words ${IGNORE_WORDS}
> +        --skip ${IGNORE_WORDS}
> +        --ignore-words-list fpr
> +        --check-filenames
> +        ${CODESPELL_WHITELIST}
> +    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
> +  )
> +else ()
> +  set(WARN_MSG "`codespell' is not found, "
> +               "so ${PROJECT_NAME}-codespell target is dummy")
> +  add_custom_command(TARGET ${PROJECT_NAME}-codespell
> +    COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --red ${MSG}
> +    COMMENT ${MSG}
> +  )
> +endif (CODESPELL)
> diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
> index 58cba5ba..8afc42df 100644
> --- a/test/CMakeLists.txt
> +++ b/test/CMakeLists.txt
> @@ -68,6 +68,7 @@ endif()
>   add_custom_target(${PROJECT_NAME}-lint DEPENDS
>     ${PROJECT_NAME}-luacheck
>     ${PROJECT_NAME}-flake8
> +  ${PROJECT_NAME}-codespell
>   )
>   
>   set(LUAJIT_TEST_COMMAND "${LUAJIT_TEST_BINARY} -e dofile[[${LUAJIT_TEST_INIT}]]")
> diff --git a/tools/codespell-ignore-words.txt b/tools/codespell-ignore-words.txt
> new file mode 100644
> index 00000000..ceeed47c
> --- /dev/null
> +++ b/tools/codespell-ignore-words.txt
> @@ -0,0 +1,3 @@
> +mmaped
> +isnt
> +FPR


More information about the Tarantool-patches mailing list