We no longer have two doc systems, move sphinx_doc_src back to doc_src

This commit is contained in:
Aaron Gyes 2020-02-19 17:00:35 -08:00
parent 4e883aa045
commit 85a0ca66e0
117 changed files with 6 additions and 6 deletions

4
.gitattributes vendored
View File

@ -26,6 +26,6 @@
# for linguist; let github identify our project as C++ instead of C due to pcre2 # for linguist; let github identify our project as C++ instead of C due to pcre2
/pcre2/* linguist-vendored /pcre2/* linguist-vendored
angular.js linguist-vendored angular.js linguist-vendored
/sphinx_doc_src/* linguist-documentation /doc_src/* linguist-documentation
*.fish linguist-language=fish *.fish linguist-language=fish
tests/*.in linguist-language=fish /tests/*.in linguist-language=fish

View File

@ -6,7 +6,7 @@ FIND_PROGRAM(SPHINX_EXECUTABLE NAMES sphinx-build
INCLUDE(FeatureSummary) INCLUDE(FeatureSummary)
SET(SPHINX_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sphinx_doc_src") SET(SPHINX_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc_src")
SET(SPHINX_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/user_doc") SET(SPHINX_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/user_doc")
SET(SPHINX_BUILD_DIR "${SPHINX_ROOT_DIR}/build") SET(SPHINX_BUILD_DIR "${SPHINX_ROOT_DIR}/build")
SET(SPHINX_CACHE_DIR "${SPHINX_ROOT_DIR}/doctrees") SET(SPHINX_CACHE_DIR "${SPHINX_ROOT_DIR}/doctrees")
@ -26,7 +26,7 @@ ADD_CUSTOM_TARGET(sphinx-docs
-d "${SPHINX_CACHE_DIR}" -d "${SPHINX_CACHE_DIR}"
"${SPHINX_SRC_DIR}" "${SPHINX_SRC_DIR}"
"${SPHINX_HTML_DIR}" "${SPHINX_HTML_DIR}"
DEPENDS sphinx_doc_src/fish_indent_lexer.py fish_indent DEPENDS ${SPHINX_SRC_DIR}/fish_indent_lexer.py fish_indent
COMMENT "Building HTML documentation with Sphinx") COMMENT "Building HTML documentation with Sphinx")
# sphinx-manpages needs the fish_indent binary for the version number # sphinx-manpages needs the fish_indent binary for the version number

Some files were not shown because too many files have changed in this diff Show More