[libvirt] [PATCH] docs: Load libvirt_access*.xml from build dir
Daniel P. Berrange
berrange at redhat.com
Fri Sep 20 14:47:01 UTC 2013
On Fri, Sep 20, 2013 at 08:41:54AM -0600, Eric Blake wrote:
> On 09/20/2013 08:16 AM, Jiri Denemark wrote:
>
> >> +++ b/docs/Makefile.am
> >> @@ -242,6 +242,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
> >> html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
> >> $(AM_V_GEN)if [ -x $(XSLTPROC) ] ; then \
> >> $(XSLTPROC) --nonet -o $(srcdir)/ \
> >> + --stringparam builddir $(abs_top_builddir) \
>
> The makefile populates it without ''...
>
>
> >>
> >> + <xsl:param name="builddir" select=".."/>
>
> as does your default...
That's a mistake :-)
>
> >
> > Oh, actually, the above should have been select="'..'" as this is a
> > string parameter. It should only matter when someone calls xsltproc by
> > hand as the Makefile always overrides the default value.
>
> >> <xsl:variable name="acls">
> >> - <xsl:copy-of select="document('../src/libvirt_access.xml')/aclinfo/api"/>
> >> + <xsl:copy-of select="document('{$builddir}/src/libvirt_access.xml')/aclinfo/api"/>
>
> and you are expanding {$builddir} _within_ a '' context. I'm assuming
> that as written, it expands to ('../src/...'), but if builddir is
> defined with "'..'", it would expand to (''..'/src/...'). So what am I
> missing (probably a misunderstanding on my part about how xslt variable
> expansion works)?
Yeah, this is fine as written here. I'm not going to try to explain
XSLT here because it is mostly inexplicable ;-)
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
More information about the libvir-list
mailing list