diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 17:42:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 17:42:47 +0000 |
| commit | 56f9e46b841c7be478ca038d8d4085d776ab4b0d (patch) | |
| tree | 9236b179a00b5b5ece25b328dfcb34299619264a | |
| parent | c8f21dbfc3dea943ca5edac2f00058477ecb5b6b (diff) | |
| parent | fea346f569d4132296f7c26367374fcace80e096 (diff) | |
| download | qemu-56f9e46b841c7be478ca038d8d4085d776ab4b0d.zip qemu-56f9e46b841c7be478ca038d8d4085d776ab4b0d.tar.gz qemu-56f9e46b841c7be478ca038d8d4085d776ab4b0d.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-02-20' into staging
QAPI patches for 2017-02-20
# gpg: Signature made Mon 20 Feb 2017 13:31:12 GMT
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2017-02-20:
Makefile: Put VERSION info into version.texi rather than using -D
qapi2texi: replace quotation by bold section name
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | docs/qemu-ga-ref.texi | 2 | ||||
| -rw-r--r-- | docs/qemu-qmp-ref.texi | 2 | ||||
| -rwxr-xr-x | scripts/qapi2texi.py | 10 |
5 files changed, 19 insertions, 13 deletions
@@ -107,6 +107,7 @@ docs/qemu-ga-ref.info* docs/qemu-qmp-ref.info* /qemu-ga-qapi.texi /qemu-qapi.texi +/version.texi *.tps .stgit-* cscope.* @@ -516,7 +516,7 @@ distclean: clean rm -f qemu-doc.vr qemu-doc.txt rm -f config.log rm -f linux-headers/asm - rm -f qemu-ga-qapi.texi qemu-qapi.texi + rm -f qemu-ga-qapi.texi qemu-qapi.texi version.texi rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf @@ -663,21 +663,24 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ # documentation MAKEINFO=makeinfo -MAKEINFOFLAGS=--no-split --number-sections -D 'VERSION $(VERSION)' -TEXIFLAG=$(if $(V),,--quiet) --command='@set VERSION $(VERSION)' +MAKEINFOFLAGS=--no-split --number-sections +TEXIFLAG=$(if $(V),,--quiet) -%.html: %.texi +version.texi: $(SRC_PATH)/VERSION + $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@") + +%.html: %.texi version.texi $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \ --html $< -o $@,"GEN","$@") -%.info: %.texi +%.info: %.texi version.texi $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") -%.txt: %.texi +%.txt: %.texi version.texi $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \ --plaintext $< -o $@,"GEN","$@") -%.pdf: %.texi +%.pdf: %.texi version.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I . $< -o $@,"GEN","$@") qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool diff --git a/docs/qemu-ga-ref.texi b/docs/qemu-ga-ref.texi index 87cc8d0..ddb76ce 100644 --- a/docs/qemu-ga-ref.texi +++ b/docs/qemu-ga-ref.texi @@ -1,6 +1,8 @@ \input texinfo @setfilename qemu-ga-ref.info +@include version.texi + @exampleindent 0 @paragraphindent 0 diff --git a/docs/qemu-qmp-ref.texi b/docs/qemu-qmp-ref.texi index 818e525..0a00569 100644 --- a/docs/qemu-qmp-ref.texi +++ b/docs/qemu-qmp-ref.texi @@ -1,6 +1,8 @@ \input texinfo @setfilename qemu-qmp-ref.info +@include version.texi + @exampleindent 0 @paragraphindent 0 diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py index 83ded95..c1071c6 100755 --- a/scripts/qapi2texi.py +++ b/scripts/qapi2texi.py @@ -159,12 +159,10 @@ def texi_body(doc): func = texi_example if name: - # FIXME the indentation produced by @quotation in .txt and - # .html output is confusing - body += "\n@quotation %s\n%s\n@end quotation" % \ - (name, func(doc)) - else: - body += func(doc) + # prefer @b over @strong, so txt doesn't translate it to *Foo:* + body += "\n\n@b{%s:}\n" % name + + body += func(doc) return body |