[PATCH] build: workaround xmlto/xsltproc bug that fails distcheck

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] build: workaround xmlto/xsltproc bug that fails distcheck

Carlo Marcelo Arenas Belon
when building the documentation out of tree, xmlto will be unable to
merge the generated entities with the tutorial if not on the same dir.

before calling xmllint, copy tutorial.xml to the working directory and
create a tutorial.rm flag so it can be later removed.

Signed-off-by: Carlo Marcelo Arenas Belon <[hidden email]>
---
 doc/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d892d5d..01117b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -19,7 +19,9 @@ TUTORIAL_LISTINGS = $(TUTORIAL_CSOURCES:.c=.xml)
  echo ']]></programlisting>' >> $@
 
 tutorial-html/index.html: tutorial.xml $(TUTORIAL_LISTINGS) css.xsl tutorial.css
- xmllint --valid --noout --path . $< && xmlto -v --searchpath . -o tutorial-html --extensions -m $(top_srcdir)/doc/css.xsl xhtml $<
+ cp -f $(top_srcdir)/doc/tutorial.xml . && touch tutorial.rm || true
+ xmllint --valid --noout --path . ./tutorial.xml && xmlto -v --searchpath . -o tutorial-html --extensions -m $(top_srcdir)/doc/css.xsl xhtml ./tutorial.xml
+ \rm tutorial.rm && rm -f tutorial.xml || true
  cp -f $(top_srcdir)/doc/tutorial.css tutorial-html/
 
 tutorial.pdf: tutorial.xml $(TUTORIAL_LISTINGS)
--
1.7.1.1


_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] build: workaround xmlto/xsltproc bug that fails distcheck

ohnobinki
On Sun, Jul 04, 2010 at 06:55:39AM -0700, Carlo Marcelo Arenas Belon wrote:
> when building the documentation out of tree, xmlto will be unable to
> merge the generated entities with the tutorial if not on the same dir.
>
> before calling xmllint, copy tutorial.xml to the working directory and
> create a tutorial.rm flag so it can be later removed.

I sent a patch that fixed xmlto itself to xmlto's maintainer in April and he promised that he would fix xmlto and make a bugfix release someday. This, of course, hasn't happened yet. I just sent another email to him so hopefully he'll wake up ;-).

However, maybe I'm crazy, but I'd prefer to hold off on this patch in the hopes that xmlto will be fixed. Having fewer workarounds in the buildsystem means a cleaner buildsystem. But I understand that this approach may not work for everyone.

I have attached my patch to xmlto in case if anyone's interested. Perhaps I'm making a bigger deal out of this than I should, though ;-).

--
binki

Look out for missing apostrophes!

_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel

xmlto-r50-searchpath-fixes.patch (4K) Download Attachment
attachment1 (205 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] build: workaround xmlto/xsltproc bug that fails distcheck

Carlo Marcelo Arenas Belon
On Tue, Jul 06, 2010 at 10:54:30PM -0400, Nathan Phillip Brink wrote:
> On Sun, Jul 04, 2010 at 06:55:39AM -0700, Carlo Marcelo Arenas Belon wrote:
> > when building the documentation out of tree, xmlto will be unable to
> > merge the generated entities with the tutorial if not on the same dir.
> >
> > before calling xmllint, copy tutorial.xml to the working directory and
> > create a tutorial.rm flag so it can be later removed.
>
> I sent a patch that fixed xmlto itself to xmlto's maintainer in April and he promised that he would fix xmlto and make a bugfix release someday. This, of course, hasn't happened yet. I just sent another email to him so hopefully he'll wake up ;-).

OK, eventhough I had to admit that when I look at it seemed more of a
problem with xsltproc, but is nice to see the xmlto patch you mentioned
before and which hopefully will get released eventually.

> However, maybe I'm crazy, but I'd prefer to hold off on this patch in the hopes that xmlto will be fixed.

OK, make distcheck working is not that high of a priority IMHO either
but since `make check` in a release package was broken with the recent
commits was interested on fixing this one as well, since your comments
from the commit log seemed to imply it should be working anyway.

> Having fewer workarounds in the buildsystem means a cleaner buildsystem.
> But I understand that this approach may not work for everyone.

Agree

> I have attached my patch to xmlto in case if anyone's interested. Perhaps I'm making a bigger deal out of this than I should, though ;-).

Hopefully it is now clearer to everyone what is broken and why, but
other than that I don't think it is that big of a deal.

Carlo

PS. that was a big patch, probably difficult to review too, which
    might be what is holding it out.

_______________________________________________
Confuse-devel mailing list
[hidden email]
http://lists.nongnu.org/mailman/listinfo/confuse-devel