mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-02 04:15:46 +00:00
Handle HTML generation in the absence of XHTML1 DTDs
* configure.in libvirt.spec.in docs/Makefile.am: fix the problem of HTML generation in the absence of XHTML1 DTDs in the system catalog. Daniel
This commit is contained in:
parent
b73d495754
commit
4240b3fd63
@ -1,3 +1,9 @@
|
|||||||
|
Wed Aug 20 15:11:57 CEST 2008 Daniel Veillard <veillard@redhat.com>
|
||||||
|
|
||||||
|
* configure.in libvirt.spec.in docs/Makefile.am: fix the problem
|
||||||
|
of HTML generation in the absence of XHTML1 DTDs in the system
|
||||||
|
catalog.
|
||||||
|
|
||||||
Wed Aug 20 14:49:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
|
Wed Aug 20 14:49:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
|
||||||
|
|
||||||
* src/network_conf.c src/network_conf.h src/qemu_driver.c: allow to
|
* src/network_conf.c src/network_conf.h src/qemu_driver.c: allow to
|
||||||
|
@ -97,6 +97,7 @@ AC_PATH_PROG([RM], [rm], [/bin/rm])
|
|||||||
AC_PATH_PROG([MV], [mv], [/bin/mv])
|
AC_PATH_PROG([MV], [mv], [/bin/mv])
|
||||||
AC_PATH_PROG([TAR], [tar], [/bin/tar])
|
AC_PATH_PROG([TAR], [tar], [/bin/tar])
|
||||||
AC_PATH_PROG([XMLLINT], [xmllint], [/usr/bin/xmllint])
|
AC_PATH_PROG([XMLLINT], [xmllint], [/usr/bin/xmllint])
|
||||||
|
AC_PATH_PROG([XMLCATALOG], [xmlcatalog], [/usr/bin/xmlcatalog])
|
||||||
AC_PATH_PROG([XSLTPROC], [xsltproc], [/usr/bin/xsltproc])
|
AC_PATH_PROG([XSLTPROC], [xsltproc], [/usr/bin/xsltproc])
|
||||||
|
|
||||||
AC_PROG_MKDIR_P
|
AC_PROG_MKDIR_P
|
||||||
|
@ -94,18 +94,22 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl
|
|||||||
$(XSLTPROC) --stringparam pagename $$name --nonet --html $(top_srcdir)/docs/site.xsl $< > $@ || (rm $@ && exit 1) ; fi )
|
$(XSLTPROC) --stringparam pagename $$name --nonet --html $(top_srcdir)/docs/site.xsl $< > $@ || (rm $@ && exit 1) ; fi )
|
||||||
|
|
||||||
%.html: %.html.tmp
|
%.html: %.html.tmp
|
||||||
@(if [ -x $(XMLLINT) ] ; then \
|
@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \
|
||||||
|
if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \
|
||||||
echo "Validating $@" ; \
|
echo "Validating $@" ; \
|
||||||
$(XMLLINT) --nonet --format --valid $< > $@ || : ; fi );
|
$(XMLLINT) --nonet --format --valid $< > $@ || : ; \
|
||||||
|
else echo "missing XHTML1 DTD" ; fi ; fi );
|
||||||
|
|
||||||
|
|
||||||
$(srcdir)/html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
|
$(srcdir)/html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
|
||||||
-@(if [ -x $(XSLTPROC) ] ; then \
|
-@(if [ -x $(XSLTPROC) ] ; then \
|
||||||
echo "Rebuilding the HTML pages from the XML API" ; \
|
echo "Rebuilding the HTML pages from the XML API" ; \
|
||||||
$(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi )
|
$(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi )
|
||||||
-@(if [ -x $(XMLLINT) ] ; then \
|
-@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \
|
||||||
|
if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \
|
||||||
echo "Validating the resulting XHTML pages" ; \
|
echo "Validating the resulting XHTML pages" ; \
|
||||||
$(XMLLINT) --nonet --valid --noout html/*.html ; fi );
|
$(XMLLINT) --nonet --valid --noout html/*.html ; \
|
||||||
|
else echo "missing XHTML1 DTD" ; fi ; fi );
|
||||||
|
|
||||||
libvirt-api.xml libvirt-refs.xml: apibuild.py \
|
libvirt-api.xml libvirt-refs.xml: apibuild.py \
|
||||||
$(srcdir)/../include/libvirt/*.h \
|
$(srcdir)/../include/libvirt/*.h \
|
||||||
|
@ -72,6 +72,7 @@ Requires: parted
|
|||||||
BuildRequires: xen-devel
|
BuildRequires: xen-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
|
BuildRequires: xhtml1-dtds
|
||||||
BuildRequires: readline-devel
|
BuildRequires: readline-devel
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
|
Loading…
Reference in New Issue
Block a user