Skip to content

Commit

Permalink
build: define helptags target which always runs.
Browse files Browse the repository at this point in the history
Specify that the ${GENERATED_HELP_TAGS} "command" (output) depends on
`helptags` so that it always regenerates the doc/ tags. (cmake "targets"
always run, whereas "commands" are contingent on their dependencies. But
we don't define doc/ dependencies because they are circular.)
  • Loading branch information
justinmk committed Jun 6, 2016
1 parent 2343463 commit 704b58e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ endif
mkdir -p build
touch $@

oldtest: | nvim tags
oldtest: | nvim helptags
+$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)

tags: | nvim
helptags: | nvim
+$(BUILD_CMD) -C build runtime/doc/tags

functionaltest: | nvim
Expand Down
7 changes: 6 additions & 1 deletion runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ add_custom_command(OUTPUT copy_docfiles
${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
)

add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
add_custom_target(helptags
COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
-u NONE
-i NONE
Expand All @@ -45,6 +45,11 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc"
)

add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
DEPENDS
helptags
)

add_custom_target(doc_html
COMMAND make html
DEPENDS
Expand Down

0 comments on commit 704b58e

Please sign in to comment.