From 3bbd1c77ab9c7ab3c910bc41d04f7e5db7c3496e Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 12 Jan 2018 15:01:44 -0500 Subject: [PATCH] doc: recent kconfig changes break doc generation Instead of wildcards we now are using environment variables to set the path to Kconfig files for board and architecture. This break documentation generation for Kconfig variables. Using the env variables, we now set the path to what it used to be to restore previous behavior. Also, when something like this happens in the future, we should abort on doc creation failure. Signed-off-by: Anas Nashif --- .shippable.yml | 4 ++++ doc/Makefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.shippable.yml b/.shippable.yml index 499b2c14234..199a7792e92 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -42,6 +42,10 @@ build: echo "- Building Documentation"; echo "Commit range:" ${COMMIT_RANGE} make htmldocs + if [ "$?" != "0" ]; then + echo "Documentation build failed"; + exit 1; + fi if [ -s doc/doc.warnings ]; then echo " => New documentation warnings/errors"; cp doc/doc.warnings doc.warnings diff --git a/doc/Makefile b/doc/Makefile index 05170252a94..52148a81ce9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -73,7 +73,7 @@ content: scripts/extract_content.py $(Q)$< kconfig: scripts/genrest/genrest.py - $(Q)srctree=../ KERNELVERSION=1.9.99 SRCARCH=x86 python3 $< ../Kconfig reference/kconfig/ + $(Q)srctree=../ ENV_VAR_BOARD_DIR=boards/*/*/ ENV_VAR_ARCH=* KERNELVERSION=1.9.99 SRCARCH=x86 python3 $< ../Kconfig reference/kconfig/ prep: doxy content kconfig