diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-01-04 11:36:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 11:36:49 +0100 |
| commit | 7436a62168d9bc8bb3b5e472a4342ac6ee6d8578 (patch) | |
| tree | 9247a44afb768e7125c6f0590a20ad06d0672dfd | |
| parent | c403a95a5297c7d31af5bf9d518d6c6a345b0297 (diff) | |
| parent | 6b3fa0689c904e3fbe0fd828ba0e76bb8237f103 (diff) | |
| download | rneovim-7436a62168d9bc8bb3b5e472a4342ac6ee6d8578.tar.gz rneovim-7436a62168d9bc8bb3b5e472a4342ac6ee6d8578.tar.bz2 rneovim-7436a62168d9bc8bb3b5e472a4342ac6ee6d8578.zip | |
Merge #9451 from justinmk/build
build: fix `doc_html` target
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cmake/GenerateHelptags.cmake.in | 39 | ||||
| -rw-r--r-- | runtime/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 41 deletions
@@ -101,7 +101,7 @@ else endif helptags: | nvim - +$(BUILD_CMD) -C build helptags + +$(BUILD_CMD) -C build runtime/doc/tags # Builds help HTML _and_ checks for invalid help tags. helphtml: | nvim helptags diff --git a/cmake/GenerateHelptags.cmake.in b/cmake/GenerateHelptags.cmake.in deleted file mode 100644 index db6f15b1be..0000000000 --- a/cmake/GenerateHelptags.cmake.in +++ /dev/null @@ -1,39 +0,0 @@ -if(DEFINED ENV{DESTDIR}) - file(TO_CMAKE_PATH - $ENV{DESTDIR}/@CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc - HELPTAGS_WORKING_DIRECTORY) -else() - file(TO_CMAKE_PATH - @CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc - HELPTAGS_WORKING_DIRECTORY) -endif() - -message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}") -if(EXISTS ${HELPTAGS_WORKING_DIRECTORY}/) - message(STATUS "${HELPTAGS_WORKING_DIRECTORY} already exists") - # If the doc directory already exists, helptags could fail due to duplicate - # tags. Tell the user to remove the directory and try again. - set(TROUBLESHOOTING "\nRemove \"${HELPTAGS_WORKING_DIRECTORY}\" and try again.") -endif() - -# Workaround for hanging "yes | nvim -c 'helptags ++t .'" -# and therefore hanging "yes | make install": -# Set INPUT_FILE to an empty file, causing execute_process -# to disregard other standard input (such as "yes |"). -set(EMPTY_FILE ${CMAKE_CURRENT_BINARY_DIR}/.GenerateHelptags) -file(WRITE ${EMPTY_FILE} "") -execute_process( - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim - -u NONE - -es - -c "helptags ++t ." - -c quit - WORKING_DIRECTORY ${HELPTAGS_WORKING_DIRECTORY} - INPUT_FILE ${EMPTY_FILE} - OUTPUT_VARIABLE err - ERROR_VARIABLE err - RESULT_VARIABLE res) - -if(NOT res EQUAL 0) - message(FATAL_ERROR "Generating helptags failed: ${err} - ${res}${TROUBLESHOOTING}") -endif() diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index f3bfd786ad..d66e04f5f2 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -78,7 +78,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS} add_custom_target(doc_html COMMAND make html DEPENDS - helptags + ${GENERATED_HELP_TAGS} WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc" ) |