adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 8

doc: get output folder from environment

Browse source 
Pull the output build folder from the environment, instead of hardcoding
the HTML output folder, which is wrong for the latex build.

Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
Jordan Yates 2024-09-23 21:35:38 +10:00 committed by Mahesh Mahadevan
parent 68479a8c8c
commit fd58374663
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/CMakeLists.txt
View file

@ -151,7 +151,7 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${GEN_DEVICETREE_
add_doc_target( add_doc_target(
html html
COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_HTML_DIR}
${SPHINXBUILD} ${SPHINXBUILD}
-b html -b html
-c ${DOCS_CFG_DIR} -c ${DOCS_CFG_DIR}
@ -208,7 +208,7 @@ add_dependencies(html-live devicetree)
add_doc_target( add_doc_target(
latex latex
COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_LATEX_DIR}
${SPHINXBUILD} ${SPHINXBUILD}
-b latex -b latex
-c ${DOCS_CFG_DIR} -c ${DOCS_CFG_DIR}
@ -260,7 +260,7 @@ endif()
add_doc_target( add_doc_target(
linkcheck linkcheck
COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} COMMAND ${CMAKE_COMMAND} -E env ${SPHINX_ENV} OUTPUT_DIR=${DOCS_LINKCHECK_DIR}
${SPHINXBUILD} ${SPHINXBUILD}
-b linkcheck -b linkcheck
-c ${DOCS_CFG_DIR} -c ${DOCS_CFG_DIR}

2
doc/conf.py
View file

@ -8,7 +8,7 @@ import re
import textwrap import textwrap
ZEPHYR_BASE = Path(__file__).resolve().parents[1] ZEPHYR_BASE = Path(__file__).resolve().parents[1]
ZEPHYR_BUILD = Path(os.environ.get("DOCS_HTML_DIR")).resolve() ZEPHYR_BUILD = Path(os.environ.get("OUTPUT_DIR")).resolve()
# Add the '_extensions' directory to sys.path, to enable finding Sphinx # Add the '_extensions' directory to sys.path, to enable finding Sphinx
# extensions within. # extensions within.