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

doc: recent kconfig changes break doc generation

Browse source 
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 <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-01-12 15:01:44 -05:00 committed by Anas Nashif
parent dff0cb2d65
commit 3bbd1c77ab
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.shippable.yml
View file

@ -42,6 +42,10 @@ build:
echo "- Building Documentation"; echo "- Building Documentation";
echo "Commit range:" ${COMMIT_RANGE} echo "Commit range:" ${COMMIT_RANGE}
make htmldocs make htmldocs
if [ "$?" != "0" ]; then
echo "Documentation build failed";
exit 1;
fi
if [ -s doc/doc.warnings ]; then if [ -s doc/doc.warnings ]; then
echo " => New documentation warnings/errors"; echo " => New documentation warnings/errors";
cp doc/doc.warnings doc.warnings cp doc/doc.warnings doc.warnings

2
doc/Makefile
View file

@ -73,7 +73,7 @@ content: scripts/extract_content.py
$(Q)$< $(Q)$<
kconfig: scripts/genrest/genrest.py 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 prep: doxy content kconfig