IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Workaround for hanging helptags generation. #2801

Browse Source 
Piping input into nvim causes the helptags generation to hang. For
example, the following does not work:

    yes | nvim -c "helptags ."

The helptags are generated during installation with a command similar
to the one above, using CMake's execute_process to call nvim.
As execute_process does not use an intermediate shell, the following
will cause the installation to hang:

    yes | make install

pacaur, an Arch Linux package helper, uses a similar command to
install packages [1], and thus can currently not be used to install
Neovim.

This commit adds a workaround to GenerateHelptags.cmake to circumvent
this problem.

[1] 22c00a3d05/pacaur (L825)
This commit is contained in:
Florian Walch 2015-06-06 12:36:59 +03:00
parent 98053f0f9f
commit 6609a545ad
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/GenerateHelptags.cmake
View File

@ -1,28 +1,35 @@
if(DEFINED ENV{DESTDIR}) if(DEFINED ENV{DESTDIR})
file(TO_CMAKE_PATH file(TO_CMAKE_PATH
"$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc" $ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc
HELPTAGS_WORKING_DIRECTORY) HELPTAGS_WORKING_DIRECTORY)
else() else()
file(TO_CMAKE_PATH file(TO_CMAKE_PATH
"${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc" ${CMAKE_INSTALL_PREFIX}/share/nvim/runtime/doc
HELPTAGS_WORKING_DIRECTORY) HELPTAGS_WORKING_DIRECTORY)
endif() endif()
message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.") message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}.")
if(EXISTS "${HELPTAGS_WORKING_DIRECTORY}/") if(EXISTS ${HELPTAGS_WORKING_DIRECTORY}/)
message(STATUS "${HELPTAGS_WORKING_DIRECTORY} already exists") message(STATUS "${HELPTAGS_WORKING_DIRECTORY} already exists")
# if the doc directory already exists, helptags could fail due to duplicate # If the doc directory already exists, helptags could fail due to duplicate
# tags. Tell the user to remove the directory and try again. # tags. Tell the user to remove the directory and try again.
set(TROUBLESHOOTING "\nRemove \"${HELPTAGS_WORKING_DIRECTORY}\" and try again") set(TROUBLESHOOTING "\nRemove \"${HELPTAGS_WORKING_DIRECTORY}\" and try again.")
endif() 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( execute_process(
COMMAND "${CMAKE_CURRENT_BINARY_DIR}/bin/nvim" COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim
-u NONE -u NONE
-esX -esX
-c "helptags ++t ." -c "helptags ++t ."
-c quit -c quit
WORKING_DIRECTORY "${HELPTAGS_WORKING_DIRECTORY}" WORKING_DIRECTORY ${HELPTAGS_WORKING_DIRECTORY}
INPUT_FILE ${EMPTY_FILE}
OUTPUT_VARIABLE err OUTPUT_VARIABLE err
ERROR_VARIABLE err ERROR_VARIABLE err
RESULT_VARIABLE res) RESULT_VARIABLE res)