[PATCH v2 0/9] docs: Fix migration.html generation and report such errors next time

Peter Krempa posted 9 patches 2 weeks ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/cover.1602605642.git.pkrempa@redhat.com
docs/internals/meson.build | 55 ++++++++++++++++----------
docs/kbase/meson.build     | 56 ++++++++++++++++----------
docs/manpages/meson.build  | 55 +++++++++++++++++---------
docs/meson.build           | 80 +++++++++++++++++++++++---------------
docs/migration.html.in     |  1 +
scripts/meson-html-gen.py  | 37 ------------------
scripts/meson.build        |  1 -
7 files changed, 157 insertions(+), 128 deletions(-)
delete mode 100755 scripts/meson-html-gen.py

[PATCH v2 0/9] docs: Fix migration.html generation and report such errors next time

Posted by Peter Krempa 2 weeks ago
This version refactors the XSLT transformation command a bit more
carefully and thoroughly. A semantic difference in v2 is that the output
HTMLs are no longer reformatted.

Don't apply/revert first patch to see the build failure:

[59/144] Generating migration.html with a meson_exe.py custom command
FAILED: docs/migration.html
/usr/bin/meson --internal exe --capture docs/migration.html -- /bin/xsltproc --stringparam pagesrc docs/migration.html.in --stringparam builddir /home/pipo/build/libvirt/gcc --stringparam timestamp 'Tue Oct 13 16:16:15 2020 UTC' --nonet ../../../libvirt/docs/site.xsl ../../../libvirt/docs/migration.html.in
../../../libvirt/docs/migration.html.in:664: parser error : Opening and ending tag mismatch: p line 649 and body
  </body>
         ^
../../../libvirt/docs/migration.html.in:665: parser error : Opening and ending tag mismatch: body line 649 and html
</html>
       ^
../../../libvirt/docs/migration.html.in:666: parser error : EndTag: '</' not found

^
unable to parse ../../../libvirt/docs/migration.html.in
[84/144] Generating hacking.html with a meson_exe.py custom command
ninja: build stopped: subcommand failed.

Peter Krempa (9):
  docs: migration: Fix syntax
  scripts/meson-html-gen.py: Don't rereformat output files
  docs: meson.build: Limit html files depending on 'aclperms.htmlinc'
  docs: meson.build: Generate HTML files directly by meson
  docs: meson.build: Prepare for use of identical code for XSLT
    processing of htmls
  docs/internals/meson.build: Use template code for XSLT processing
  docs/kbase/meson.build: Use template code for XSLT processing
  docs/manpages/meson.build: Use template code for XSLT processing
  scripts: meson-html-gen: Remove

 docs/internals/meson.build | 55 ++++++++++++++++----------
 docs/kbase/meson.build     | 56 ++++++++++++++++----------
 docs/manpages/meson.build  | 55 +++++++++++++++++---------
 docs/meson.build           | 80 +++++++++++++++++++++++---------------
 docs/migration.html.in     |  1 +
 scripts/meson-html-gen.py  | 37 ------------------
 scripts/meson.build        |  1 -
 7 files changed, 157 insertions(+), 128 deletions(-)
 delete mode 100755 scripts/meson-html-gen.py

-- 
2.26.2

Re: [PATCH v2 0/9] docs: Fix migration.html generation and report such errors next time

Posted by Peter Krempa 2 weeks ago
On Tue, Oct 13, 2020 at 18:18:04 +0200, Peter Krempa wrote:
> This version refactors the XSLT transformation command a bit more
> carefully and thoroughly. A semantic difference in v2 is that the output
> HTMLs are no longer reformatted.

The output can be verified here:

https://gitlab.com/pipo.sk/libvirt/-/jobs/788658848/artifacts/browse/website/

Re: [PATCH v2 0/9] docs: Fix migration.html generation and report such errors next time

Posted by Martin Kletzander 1 week ago
On Tue, Oct 13, 2020 at 06:30:32PM +0200, Peter Krempa wrote:
>On Tue, Oct 13, 2020 at 18:18:04 +0200, Peter Krempa wrote:
>> This version refactors the XSLT transformation command a bit more
>> carefully and thoroughly. A semantic difference in v2 is that the output
>> HTMLs are no longer reformatted.
>
>The output can be verified here:
>
>https://gitlab.com/pipo.sk/libvirt/-/jobs/788658848/artifacts/browse/website/
>

Yeah, that shows me I need to do one other fix for the migration.html (see last
code block) or our stylesheet (probably the former, though).

Anyway this looks good except one tiny little thing (or three), so

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

if you fix s/an comment/a comment/ in commit messages for patches 6, 7 and 8 ;-)

Thanks for fixing my error and making the build even better.