From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] gnu: gnome-doc-utils: Do not omit tests Date: Mon, 23 Jun 2014 10:12:31 +0200 Message-ID: <87bntknixc.fsf@gnu.org> References: <1403422253-9505-1-git-send-email-jmd@gnu.org> <87egygd973.fsf@gnu.org> <20140623044444.GA19164@jocasta.intra> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WyzMj-00060m-NT for guix-devel@gnu.org; Mon, 23 Jun 2014 04:12:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WyzMf-0001zJ-Dp for guix-devel@gnu.org; Mon, 23 Jun 2014 04:12:37 -0400 In-Reply-To: <20140623044444.GA19164@jocasta.intra> (John Darrington's message of "Mon, 23 Jun 2014 06:44:45 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: John Darrington Cc: guix-devel@gnu.org, John Darrington John Darrington skribis: > On Sun, Jun 22, 2014 at 09:40:32PM +0200, Ludovic Court??s wrote: >=20=20=20=20=20=20 > John Darrington skribis: >=20=20=20=20=20=20 > > * gnu/packages/gnome.scm (gnome-doc-utils): Added pre-check phase = and do not > > skip check phase >=20=20=20=20=20=20 > [...] >=20=20=20=20=20=20 > > + ;; 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 > > + " > > + > +\"file:///usr/share/xml/schema/xml-core/catalog.dtd\"> > > + > > + > +uri=3D\"file://" docbook-xml "/xml/dtd/docbook/docbookx.dtd\"/> > > + > +uri=3D\"file://" docbook-xsl "/xml/xsl/docbook-xsl-1.72.0/manpag= es/docbook.xsl\"/> > > +\n")))))) > > + %standard-phases))) >=20=20=20=20=20=20 > Seems about time to discuss factorization. :-) >=20=20=20=20=20=20 > Docbook-{XML,XSL} both provide a catalog.xml file. Would it be enou= gh > to set XML_CATALOG_FILES=3D/first/one/catalog.xml:/second/one/catalo= g.xml > rather than creating a new catalog.xml file that just points to them? >=20=20=20=20=20=20 > The problem is, that some files refer to=20 > > http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd > others to=20 > http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd > or > http://www.oasis-open.org/docbook/xml/4.2.1/docbookx.dtd > > Similarly, I have seen urls like > http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl > http://docbook.sourceforge.net/release/xsl/1.72/manpages/docbook.xsl > and other variations. This seems to be a matter of providing packages for all these versions, no? I suppose the catalog.xml file in the =E2=80=98docbook-xml-4.4=E2=80=99 pac= kage does the right thing for the 4.4 URLs, doesn=E2=80=99t it? Ludo=E2=80=99.