diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2015-06-06 17:10:52 -0700 |
|---|---|---|
| committer | rockon999 <rockon999@users.noreply.github.com> | 2018-08-06 02:51:15 -0500 |
| commit | 0aeaf6e39890699cdedeace43378f681b243528d (patch) | |
| tree | 6caa8323a0692472e4145de2e310f65a303ed4b4 | |
| parent | ac9fab2e20ff9056f5783adade1efb3f1a21fc64 (diff) | |
| download | gobject-introspection-0aeaf6e39890699cdedeace43378f681b243528d.tar.gz | |
docwriter: Option to select output format
For generating other output formats such as DevDocs-ready HTML, we add an
output format option (-f). The default output format is "mallard" which
leaves the existing behaviour unchanged.
We can fold the existing --write-sections-file option into the new output
format option, as a new "sections" format.
| -rw-r--r-- | giscanner/docmain.py | 3 | ||||
| -rw-r--r-- | giscanner/docwriter.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/giscanner/docmain.py b/giscanner/docmain.py index 966b33c2..c91cce95 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -61,6 +61,9 @@ def doc_main(args): args = parser.parse_args(args[1:]) if not args.output: raise SystemExit("missing output parameter") + if args.format not in FORMATS: + raise SystemExit("Unknown output format %s (supported: %s)" % + (args.format, ", ".join(FORMATS))) if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR'] diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index d9c2ed57..a59cc7f2 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -910,6 +910,7 @@ class DocWriter(object): self._formatter = formatter_class(self._transformer) self._language = self._formatter.language + self._output_format = output_format self._lookup = self._get_template_lookup() |