diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-21 08:53:23 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-21 08:53:23 +0000 |
| commit | fc39f81a2573b08f77391b21f38271858906a9ed (patch) | |
| tree | 290a5912536f45c6350dd716e9176554e48f4470 | |
| parent | 034f989babc9e89aeb59c0a7c0094600fe59504a (diff) | |
| parent | b3878133f152c5eb361eb2524d8198563ec04c65 (diff) | |
| download | buildstream-fc39f81a2573b08f77391b21f38271858906a9ed.tar.gz | |
Merge branch 'tristan/fix-doc-builds' into 'master'
Documentation build fixes
See merge request BuildStream/buildstream!1871
| -rw-r--r-- | doc/Makefile | 13 | ||||
| -rw-r--r-- | tox.ini | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/Makefile b/doc/Makefile index 4a9373d34..43b0cd054 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -106,13 +106,20 @@ sessions-prep: mkdir -p source/sessions cp source/sessions-stored/*.html source/sessions +# bst2html is called unconditionally for every session file in SESSION_FILES. +# # By default, this will generate the html fragments of colorized BuildStream terminal -# output only if they don't yet exist. +# output only if the output html files don't yet exist. # # Specify BST_FORCE_SESSION_REBUILD=1 to force rebuild all session html files. # -sessions: sessions-prep - $(foreach file,$(wildcard sessions/*.run),PYTHONPATH=$(PYTHONPATH) $(BST2HTML) $(BST2HTMLOPTS) $(file) ; ) +SESSION_FILES=$(wildcard sessions/*.run) +$(SESSION_FILES): sessions-prep + +%.run: + PYTHONPATH=$(PYTHONPATH) $(BST2HTML) $(BST2HTMLOPTS) $@ + +sessions: $(SESSION_FILES) sessions-clean: rm -rf source/sessions @@ -173,10 +173,11 @@ deps = sphinx_rtd_theme >= 0.4.2 pytest -rrequirements/requirements.txt - git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@be5ac19e5062bc23a46ed8ce7aa2958a2653c917#egg=bst_plugins_experimental[ostree] + git+https://gitlab.com/buildstream/bst-plugins-experimental.git@{env:BST_PLUGINS_EXPERIMENTAL_VERSION:{[config]BST_PLUGINS_EXPERIMENTAL_VERSION}}#egg=bst_plugins_experimental[ostree] passenv = BST_FORCE_SESSION_REBUILD BST_SOURCE_CACHE + BST_PLUGINS_EXPERIMENTAL_VERSION HOME LANG LC_ALL |