guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] gnu: gnome-doc-utils: Do not omit tests


From: Ludovic Courtès
Subject: Re: [PATCH] gnu: gnome-doc-utils: Do not omit tests
Date: Sun, 22 Jun 2014 21:40:32 +0200
User-agent: Gnus/5.130009 (Ma Gnus v0.9) Emacs/24.3 (gnu/linux)

Hi!

John Darrington <address@hidden> skribis:

> * gnu/packages/gnome.scm (gnome-doc-utils): Added pre-check phase and do not
>   skip check phase

[...]

> +          ;; This stuff is needed, because without it, xmlint etc tries
> +          ;; to download docbookx.dtd and docbook.xsl from the net
> +          (let ((build (assoc-ref %standard-phases 'build))
> +                (docbook-xml (assoc-ref inputs "docbook-xml"))
> +                (docbook-xsl (assoc-ref inputs "docbook-xsl"))
> +                (our-catalog "/tmp/docbook-xml.xml"))
> +            (setenv "XML_CATALOG_FILES" our-catalog)
> +            (with-output-to-file our-catalog
> +              (lambda ()
> +                (display (string-append
> +                          "<?xml version=\"1.0\"?>
> +<!DOCTYPE catalog PUBLIC \"-//OASIS//DTD XML Catalogs V1.0//EN\"
> +\"file:///usr/share/xml/schema/xml-core/catalog.dtd\">
> +<catalog xmlns=\"urn:oasis:names:tc:entity:xmlns:xml:catalog\">
> +<system systemId=\"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\";
> +uri=\"file://" docbook-xml  "/xml/dtd/docbook/docbookx.dtd\"/>
> +<system 
> systemId=\"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\";
> +uri=\"file://" docbook-xsl  
> "/xml/xsl/docbook-xsl-1.72.0/manpages/docbook.xsl\"/>
> +</catalog>\n"))))))
> +        %standard-phases)))

Seems about time to discuss factorization.  :-)

Docbook-{XML,XSL} both provide a catalog.xml file.  Would it be enough
to set XML_CATALOG_FILES=/first/one/catalog.xml:/second/one/catalog.xml
rather than creating a new catalog.xml file that just points to them?

If the answer is yes, then we might be able to use the ‘search-paths’
mechanism to automatically populate $XML_CATALOG_FILES.

WDYT?

Ludo’.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]