openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: don't run xmllint when generating API HTML files 

After generating the API HTML files we run xmllint in docs/html/*.html
to validate the correctness. Since

  commit 0aa8536f14
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Wed Nov 20 14:49:26 2019 +0000

    docs: generate API reference pages for admin, qemu & lxc libraries

we have many rules generating files into docs/html/. The xmllint
calls for each rule are picking up files which are part-generated by
other parallel build rules resulting in transient errors like:

  GEN      html/index.html
  GEN      html/index-admin.html
  GEN      html/index-qemu.html
  GEN      html/index-lxc.html
  GEN      hvsupport.html.in
html/index-lxc.html:1: parser error : Document is empty

^
make[4]: *** [Makefile:2407: html/index-qemu.html] Error 1

The easiest solution is to move the xmllint rules to the 'make check'
phase of the build.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-11-27 14:03:45 +00:00
parent 6796a3edb3
commit 8d9ca128f1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/Makefile.am
View File

@ -311,16 +311,19 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP)
$(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \
--stringparam builddir '$(abs_top_builddir)' \ --stringparam builddir '$(abs_top_builddir)' \
--stringparam timestamp $(timestamp) \ --stringparam timestamp $(timestamp) \
$(srcdir)/newapi.xsl libvirt-api.xml && \ $(srcdir)/newapi.xsl libvirt-api.xml
$(XMLLINT) --nonet --noout html/*.html
html/index-%.html: libvirt-%-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) html/index-%.html: libvirt-%-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP)
$(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \ $(AM_V_GEN)$(XSLTPROC) --nonet -o ./ \
--stringparam builddir '$(abs_top_builddir)' \ --stringparam builddir '$(abs_top_builddir)' \
--stringparam timestamp $(timestamp) \ --stringparam timestamp $(timestamp) \
--stringparam indexfile $(@:html/%=%) \ --stringparam indexfile $(@:html/%=%) \
$(srcdir)/newapi.xsl $< && \ $(srcdir)/newapi.xsl $<
$(XMLLINT) --nonet --noout html/*.html
check-html:
$(XMLLINT) --nonet --noout html/*.html
check-local: check-html
python_generated_files = \ python_generated_files = \
html/libvirt-libvirt-lxc.html \ html/libvirt-libvirt-lxc.html \