Re: [Qemu-devel] [PATCH for-2.9 07/47] qapi: Clean up build of generated documentation

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 2028 bytes --]

On 03/15/2017 02:08 AM, Markus Armbruster wrote:

>>> +++ b/.gitignore
>>> @@ -103,11 +103,11 @@
>>>  /docs/qemu-ga-ref.txt
>>
>> [1]
>>
>>>  /docs/qemu-qmp-ref.html
>>>  /docs/qemu-qmp-ref.txt
>>> -docs/qemu-ga-ref.info*
>>> -docs/qemu-qmp-ref.info*
>>> -/qemu-ga-qapi.texi
>>> -/qemu-qapi.texi
>>> -/version.texi
>>> +/docs/qemu-ga-ref.info*
>>
>> worth sorting this line up by [1]?
> 
> Fine with me, except I think we should either not mess with the order,
> or go all the way, i.e. ...
> 
>>> +/docs/qemu-qmp-ref.info*
>>> +/docs/qemu-ga-qapi.texi
> 
> ... move this one, too.  Feeding to sort leads to this incremental
> patch:
> 
> @@ -99,14 +99,14 @@
>  /pc-bios/optionrom/kvmvapic.img
>  /pc-bios/s390-ccw/s390-ccw.elf
>  /pc-bios/s390-ccw/s390-ccw.img
> +/docs/qemu-ga-qapi.texi
>  /docs/qemu-ga-ref.html
> +/docs/qemu-ga-ref.info*
>  /docs/qemu-ga-ref.txt
> +/docs/qemu-qmp-qapi.texi
>  /docs/qemu-qmp-ref.html
> -/docs/qemu-qmp-ref.txt
> -/docs/qemu-ga-ref.info*
>  /docs/qemu-qmp-ref.info*
> -/docs/qemu-ga-qapi.texi
> -/docs/qemu-qmp-qapi.texi
> +/docs/qemu-qmp-ref.txt
>  /docs/version.texi
>  *.tps
>  .stgit-*

Works for me (I always find fully-sorted lists easier to modify, because
I don't have to guess whether inserting new stuff is grouped sanely).


>>>  MAKEINFO=makeinfo
>>> -MAKEINFOFLAGS=--no-split --number-sections
>>> +MAKEINFOFLAGS=--no-split --number-sections -I docs
>>
>> Will this cause grief on any older makinfo versions (such as RHEL 6)?  I
>> didn't test myself on those setups.  I guess if a buildbot doesn't flag
>> you, it's okay.
> 
> RHEL-6 has texinfo 4.13, and its manual page documents -I.  No mention
> in NEWS, which goes back to 2.2.

Phew, we're safe then.

> 
>> The sorting issue is worth fixing, but trivial, so you can add:
>>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> Thanks!
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]