stephan 2004/03/16 06:27:35
Modified: tools/src blocks-build.xsl tools/targets compile-build.xml webapp-build.xml Log: Revert changes from 2003/05/05, instead using ANT targets to resolve dependencies between patches. Unnecessary and stupid, IMHO. Revision Changes Path 1.52 +79 -58 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- blocks-build.xsl 11 Mar 2004 15:41:43 -0000 1.51 +++ blocks-build.xsl 16 Mar 2004 14:27:35 -0000 1.52 @@ -99,6 +99,36 @@ </xsl:attribute> </target> + <target name="patch"> + <xsl:attribute name="depends"> + <xsl:text>init</xsl:text> + <xsl:for-each select="$cocoon-blocks"> + <xsl:text>,</xsl:text> + <xsl:value-of select="concat(@name, '-patch')"/> + </xsl:for-each> + </xsl:attribute> + </target> + + <target name="roles"> + <xsl:attribute name="depends"> + <xsl:text>init</xsl:text> + <xsl:for-each select="$cocoon-blocks"> + <xsl:text>,</xsl:text> + <xsl:value-of select="concat(@name, '-roles')"/> + </xsl:for-each> + </xsl:attribute> + </target> + + <target name="patch-samples"> + <xsl:attribute name="depends"> + <xsl:text>init</xsl:text> + <xsl:for-each select="$cocoon-blocks"> + <xsl:text>,</xsl:text> + <xsl:value-of select="concat(@name, '-patch-samples')"/> + </xsl:for-each> + </xsl:attribute> + </target> + <target name="samples"> <xsl:attribute name="depends"> <xsl:text>init,patch-samples</xsl:text> @@ -226,64 +256,6 @@ </target> <xsl:apply-templates select="$cocoon-blocks"/> - - <target name="patch-roles" depends="init"> - <xpatch file="${{build.dest}}/org/apache/cocoon/cocoon.roles" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.xroles" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - </target> - - <target name="patch-conf" depends="init"> - <xpatch file="${{build.webapp}}/sitemap.xmap" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.xmap" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}" addcomments="true"> - <xsl:for-each select="$cocoon-blocks"> - <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> - <xpatch file="${{build.webapp}}/WEB-INF/logkit.xconf" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.xlog" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - <xpatch file="${{build.webapp}}/WEB-INF/web.xml" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.xweb" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - </target> - - <target name="patch-samples" depends="init"> - <xpatch file="${{build.webapp}}/samples/block-samples.xml" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.xsamples" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - <xpatch file="${{build.webapp}}/samples/sitemap.xmap" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.samplesxpipe" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}"> - <xsl:for-each select="$cocoon-blocks"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <include name="{$block-name}/conf/*.samplesxconf" unless="unless.exclude.block.{$block-name}"/> - </xsl:for-each> - </xpatch> - </target> - </xsl:template> <xsl:template match="project"> @@ -325,6 +297,34 @@ <antcall target="{$block-name}-compile"/> </target> + <target name="[EMAIL PROTECTED]" unless="unless.exclude.block.{$block-name}"> + <xsl:if test="depend"> + <xsl:attribute name="depends"><xsl:value-of select="@name"/><xsl:for-each select="depend[contains(@project,'cocoon-block-')]"><xsl:text>,</xsl:text><xsl:value-of select="@project"/>-patch</xsl:for-each></xsl:attribute> + </xsl:if> + + <antcall target="{$block-name}-patches"/> + </target> + + <target name="[EMAIL PROTECTED]" unless="unless.exclude.block.{$block-name}"> + <xsl:if test="depend"> + <xsl:attribute name="depends"><xsl:value-of select="@name"/><xsl:for-each select="depend[contains(@project,'cocoon-block-')]"><xsl:text>,</xsl:text><xsl:value-of select="@project"/>-roles</xsl:for-each></xsl:attribute> + </xsl:if> + + <antcall target="{$block-name}-roles"/> + </target> + + <target name="[EMAIL PROTECTED]" unless="unless.exclude.block.{$block-name}"> + <xpatch file="${{build.webapp}}/samples/block-samples.xml" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.xsamples"/> + </xpatch> + <xpatch file="${{build.webapp}}/samples/sitemap.xmap" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.samplesxpipe"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.samplesxconf"/> + </xpatch> + </target> + <target name="[EMAIL PROTECTED]" unless="unless.exclude.block.{$block-name}"> <xsl:if test="depend"> <xsl:attribute name="depends"> @@ -490,6 +490,27 @@ <include name="**"/> </fileset> </copy> + </target> + + <target name="{$block-name}-roles" unless="unless.exclude.block.{$block-name}"> + <xpatch file="${{build.dest}}/org/apache/cocoon/cocoon.roles" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.xroles"/> + </xpatch> + </target> + + <target name="{$block-name}-patches" depends="{$block-name}-prepare" unless="unless.exclude.block.{$block-name}"> + <xpatch file="${{build.webapp}}/sitemap.xmap" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.xmap"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf" srcdir="${{blocks}}" addcomments="true"> + <include name="{$block-name}/conf/*.xconf"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/logkit.xconf" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.xlog"/> + </xpatch> + <xpatch file="${{build.webapp}}/WEB-INF/web.xml" srcdir="${{blocks}}"> + <include name="{$block-name}/conf/*.xweb"/> + </xpatch> </target> <target name="{$block-name}-samples" if="{$block-name}.has.samples"> 1.9 +1 -1 cocoon-2.1/tools/targets/compile-build.xml Index: compile-build.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/tools/targets/compile-build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- compile-build.xml 8 Mar 2004 06:07:15 -0000 1.8 +++ compile-build.xml 16 Mar 2004 14:27:35 -0000 1.9 @@ -161,7 +161,7 @@ <ant antfile="${build.temp}/blocks-build.xml" inheritAll="true" inheritRefs="false" - target="patch-roles"/> + target="roles"/> </target> <!-- compiles and packages all blocks --> 1.13 +1 -1 cocoon-2.1/tools/targets/webapp-build.xml Index: webapp-build.xml =================================================================== RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- webapp-build.xml 16 Mar 2004 13:18:48 -0000 1.12 +++ webapp-build.xml 16 Mar 2004 14:27:35 -0000 1.13 @@ -87,7 +87,7 @@ <ant antfile="${build.temp}/blocks-build.xml" inheritAll="true" inheritRefs="false" - target="patch-conf"/> + target="patch"/> </target> <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples" unless="unless.exclude.webapp.samples"/>