From fdd406b7220d6c2086a959a2c6cd69a5c7858644 Mon Sep 17 00:00:00 2001 From: myk002 Date: Sat, 9 Jul 2022 23:58:11 -0700 Subject: [PATCH] ensure all files are reread on every docs build this fixes the issue where the Stonesense docs were getting ignored --- CMakeLists.txt | 4 ++-- conf.py | 2 +- docs/build.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46bd1917b..a076bbc76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -478,13 +478,13 @@ if(BUILD_DOCS) set_source_files_properties(${SPHINX_OUTPUT} PROPERTIES GENERATED TRUE) add_custom_command(OUTPUT ${SPHINX_OUTPUT} COMMAND ${SPHINX_EXECUTABLE} - -q -b html -d "${CMAKE_BINARY_DIR}/docs/html" + -E -q -b html -d "${CMAKE_BINARY_DIR}/docs/html" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/docs/html" -w "${CMAKE_BINARY_DIR}/docs/html/_sphinx-warnings.txt" -j auto COMMAND ${SPHINX_EXECUTABLE} - -q -b text -d "${CMAKE_BINARY_DIR}/docs/text" + -E -q -b text -d "${CMAKE_BINARY_DIR}/docs/text" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/docs/text" -w "${CMAKE_BINARY_DIR}/docs/text/_sphinx-warnings.txt" diff --git a/conf.py b/conf.py index d7be99a15..530a7a312 100644 --- a/conf.py +++ b/conf.py @@ -140,7 +140,7 @@ def write_tool_docs(): os.makedirs(os.path.join('docs/tools', os.path.dirname(k[0])), mode=0o755, exist_ok=True) with open('docs/tools/{}.rst'.format(k[0]), mode) as outfile: - if k[0] != 'search': + if k[0] != 'search' and k[0] != 'stonesense': outfile.write(label) outfile.write(include) diff --git a/docs/build.sh b/docs/build.sh index c696d5fbe..28182d9c0 100755 --- a/docs/build.sh +++ b/docs/build.sh @@ -11,5 +11,5 @@ cd $(dirname "$0") cd .. -"${SPHINX:-sphinx-build}" -b html -d build/docs/html . docs/html -w build/docs/html/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@" -"${SPHINX:-sphinx-build}" -b text -d build/docs/text . docs/text -w build/docs/text/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@" +"${SPHINX:-sphinx-build}" -E -b html -d build/docs/html . docs/html -w build/docs/html/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@" +"${SPHINX:-sphinx-build}" -E -b text -d build/docs/text . docs/text -w build/docs/text/_sphinx-warnings.txt -j "${JOBS:-auto}" "$@"