cziegeler 2003/05/23 04:59:30
Modified: tools/src blocks-build.xsl
Log:
This is a lot slower, but the dependency order is preserved - we have to find
a better way!
Revision Changes Path
1.20 +7 -6 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- blocks-build.xsl 23 May 2003 02:48:04 -0000 1.19
+++ blocks-build.xsl 23 May 2003 11:59:30 -0000 1.20
@@ -86,13 +86,14 @@
<include name="{$block-name}/conf/**/*.xpipe"
unless="unless.exclude.block.{$block-name}"/>
</xsl:for-each>
</xpatch>
- <xpatch file="{string('${build.webapp}')}/WEB-INF/cocoon.xconf"
+ <!-- This is much slower, but preserves the dependencies -->
+ <xsl:for-each select="project[contains(@name,'cocoon-block-')]">
+ <xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
+ <xpatch file="{string('${build.webapp}')}/WEB-INF/cocoon.xconf"
srcdir="{string('${blocks}')}">
- <xsl:for-each select="project[contains(@name,'cocoon-block-')]">
- <xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
- <include name="{$block-name}/conf/**/*.xconf"
unless="unless.exclude.block.{$block-name}"/>
- </xsl:for-each>
- </xpatch>
+ <include name="{$block-name}/conf/**/*.xconf"
unless="unless.exclude.block.{$block-name}"/>
+ </xpatch>
+ </xsl:for-each>
<xpatch file="{string('${build.webapp}')}/WEB-INF/logkit.xconf"
srcdir="{string('${blocks}')}">
<xsl:for-each select="project[contains(@name,'cocoon-block-')]">
