diff options
| author | Raoul Hidalgo Charman <raoul.hidalgocharman@codethink.co.uk> | 2019-01-23 15:59:04 +0000 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2019-02-19 17:05:17 +0000 |
| commit | c7f76268cc6f35209587749df85f3af9cfbaabf1 (patch) | |
| tree | 5743ab0d84c47ba28fb5659acd266fadca7d82fd /doc | |
| parent | 52c0c185d964bf696e320be97663c412e020b427 (diff) | |
| download | buildstream-c7f76268cc6f35209587749df85f3af9cfbaabf1.tar.gz | |
cachedir: add new dir option that's default root to other dirs
Makes artifactdir and builddir obsolete.
Fixes #870
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/bst2html.py | 5 | ||||
| -rw-r--r-- | doc/sessions/running-commands.run | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/bst2html.py b/doc/bst2html.py index af35efe24..2f4012695 100755 --- a/doc/bst2html.py +++ b/doc/bst2html.py @@ -194,10 +194,9 @@ def workdir(source_cache=None): bst_config_file = os.path.join(tempdir, 'buildstream.conf') config = { + 'cachedir': tempdir, 'sourcedir': source_cache, - 'artifactdir': os.path.join(tempdir, 'artifacts'), 'logdir': os.path.join(tempdir, 'logs'), - 'builddir': os.path.join(tempdir, 'build'), } _yaml.dump(config, bst_config_file) @@ -411,12 +410,10 @@ def run_session(description, tempdir, source_cache, palette, config_file, force) # Encode and save the output if that was asked for output = _yaml.node_get(command, str, 'output', default_value=None) if output is not None: - # Convert / Generate a nice <div> converted = generate_html(command_out, directory, config_file, source_cache, tempdir, palette, command_str, command_fake_output is not None) - # Save it filename = os.path.join(desc_dir, output) filename = os.path.realpath(filename) diff --git a/doc/sessions/running-commands.run b/doc/sessions/running-commands.run index ce8eccd2f..41d165799 100644 --- a/doc/sessions/running-commands.run +++ b/doc/sessions/running-commands.run @@ -2,7 +2,7 @@ commands: # Make it fetch first - directory: ../examples/running-commands - command: fetch hello.bst + command: source fetch hello.bst # Capture a show output - directory: ../examples/running-commands |