diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-11-02 12:07:50 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-11-02 12:07:50 +1100 |
| commit | 8f2a4f39599f06cf2f89a2b5761b2ecb566a2c0b (patch) | |
| tree | 270fb5b763656fdb9ad68e1e5a50b95ccae2bbd6 | |
| parent | c_user: Re-add task notepads for 4.11. Remove this patch after branching. (diff) | |
| download | rtems-docs-8f2a4f39599f06cf2f89a2b5761b2ecb566a2c0b.tar.bz2 | |
waf: Fix the sphinx verbose option.
| -rw-r--r-- | common/waf.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/common/waf.py b/common/waf.py index 3036939..8782e16 100644 --- a/common/waf.py +++ b/common/waf.py @@ -62,7 +62,7 @@ def check_sphinx_version(ctx, minver): return ver def sphinx_verbose(ctx): - return ctx.options.sphinx_verbose + return ' '.join(ctx.env.SPHINX_VERBOSE) def cmd_configure(ctx): ctx.load('tex') @@ -75,9 +75,15 @@ def cmd_configure(ctx): ctx.start_msg("Checking if Sphinx is at least %s.%s" % sphinx_min_version) ver = check_sphinx_version(ctx, sphinx_min_version) - ctx.end_msg("yes (%s)" % ".".join(map(str, ver))) + ctx.start_msg("Sphinx Verbose: ") + if 'SPHINX_VERBOSE' not in ctx.env: + ctx.env.append_value('SPHINX_VERBOSE', ctx.options.sphinx_verbose) + level = sphinx_verbose(ctx) + if level == '-Q': + level = 'quiet' + ctx.end_msg(level) def html_resources(ctx): for dir_name in ["_static", "_templates"]: |