From 95665357f513275905ab9db407f7f7d36fc24aba Mon Sep 17 00:00:00 2001 From: Disassembler Date: Tue, 19 Mar 2019 14:04:13 +0100 Subject: [PATCH] Add documentation build to build-all.sh --- _build/build-all.sh | 4 ++++ _build/install-toolchain.sh | 2 +- _doc/Makefile | 2 +- _doc/conf.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_build/build-all.sh b/_build/build-all.sh index cd1fc91..b7f2ac5 100755 --- a/_build/build-all.sh +++ b/_build/build-all.sh @@ -3,6 +3,10 @@ set -ev cd $(realpath $(dirname "${0}")) +# Build documentation +cd ../_doc +make html + # Build basic.tar cd ../_vm tar cpf /srv/build/_vm.tar * diff --git a/_build/install-toolchain.sh b/_build/install-toolchain.sh index 5f7ff5d..ae9f912 100755 --- a/_build/install-toolchain.sh +++ b/_build/install-toolchain.sh @@ -9,7 +9,7 @@ apk add git file htop less openssh-client openssh-server openssh-sftp-server tar # Install Alpine SDK apk add alpine-sdk # Install Sphinx support -apk-add py3-sphinx +apk add py3-sphinx pip3 install recommonmark sphinx-markdown-tables # Copy root profile files and settings diff --git a/_doc/Makefile b/_doc/Makefile index 8d9e831..eaf4282 100644 --- a/_doc/Makefile +++ b/_doc/Makefile @@ -5,7 +5,7 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build-3 SOURCEDIR = . -BUILDDIR = _build +BUILDDIR = /srv/build/doc # Put it first so that "make" without argument is like "make help". help: diff --git a/_doc/conf.py b/_doc/conf.py index 0cfab17..cf81306 100644 --- a/_doc/conf.py +++ b/_doc/conf.py @@ -87,7 +87,7 @@ html_theme = 'sphinx_rtd_theme' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +# html_static_path = ['_static'] # Custom sidebar templates, must be a dictionary that maps document names # to template names.