Author: vgritsenko Date: Thu Mar 10 13:19:04 2005 New Revision: 156993 URL: http://svn.apache.org/viewcvs?view=rev&rev=156993 Log: Build: Added exclude.all.blocks and include.all.blocks properties to quickly toggle all blocks on or off.
Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties cocoon/branches/BRANCH_2_1_X/status.xml cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/blocks.properties?view=diff&r1=156992&r2=156993 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/blocks.properties (original) +++ cocoon/branches/BRANCH_2_1_X/blocks.properties Thu Mar 10 13:19:04 2005 @@ -36,6 +36,14 @@ # using "build generate-blocks.properties". Any changes to blocks definitions # must be made in gump.xml, not here. +# All blocks ------------------------------------------------------------------- + +# Use this property to exclude all blocks at once +# exclude.all.blocks=true + +# Use this property to include all blocks at once +# include.all.blocks=true + # Stable blocks ---------------------------------------------------------------- Modified: cocoon/branches/BRANCH_2_1_X/status.xml URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&r1=156992&r2=156993 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/status.xml (original) +++ cocoon/branches/BRANCH_2_1_X/status.xml Thu Mar 10 13:19:04 2005 @@ -202,6 +202,10 @@ <changes> <release version="@version@" date="@date@"> + <action dev="VG" type="update"> + Build: Added exclude.all.blocks and include.all.blocks properties + to quickly toggle all blocks on or off. + </action> <action dev="AG" type="update"> Updated antlr to 2.7.5, groovy to 1.0-beta-10, jetty to 4.2.23 </action> Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl?view=diff&r1=156992&r2=156993 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl (original) +++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl Thu Mar 10 13:19:04 2005 @@ -64,30 +64,36 @@ <macrodef name="test-include-block"> <attribute name="name"/> <sequential> - <condition property="[EMAIL PROTECTED]"> - <not> - <istrue value="[EMAIL PROTECTED]"/> - </not> - </condition> - <condition property="[EMAIL PROTECTED]"> - <isfalse value="[EMAIL PROTECTED]"/> - </condition> + <condition property="[EMAIL PROTECTED]"> + <not> + <istrue value="[EMAIL PROTECTED]"/> + </not> + </condition> + <condition property="[EMAIL PROTECTED]"> + <and> + <isfalse value="${{include.all.blocks}}"/> + <or> + <istrue value="${{exclude.all.blocks}}"/> + <isfalse value="[EMAIL PROTECTED]"/> + </or> + </and> + </condition> </sequential> - </macrodef> + </macrodef> - <macrodef name="print-excluded-block"> + <macrodef name="print-excluded-block"> <attribute name="name"/> <sequential> - <if> - <istrue value="[EMAIL PROTECTED]"/> - <then> - <echo message=" Block '@{{name}}' is excluded from the build."/> - </then> - </if> + <if> + <istrue value="[EMAIL PROTECTED]"/> + <then> + <echo message=" Block '@{{name}}' is excluded from the build."/> + </then> + </if> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-compile"> + <macrodef name="block-compile"> <attribute name="name"/> <attribute name="package"/> <attribute name="dir"/> @@ -215,9 +221,9 @@ </then> </if> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-patch"> + <macrodef name="block-patch"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -263,9 +269,9 @@ </sitemap-components> --> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-roles"> + <macrodef name="block-roles"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -273,9 +279,9 @@ <include name="conf/*.xroles"/> </xpatch> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-patch-samples"> + <macrodef name="block-patch-samples"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -286,9 +292,9 @@ <include name="conf/*.samplesxconf"/> </xpatch> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-samples"> + <macrodef name="block-samples"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -307,9 +313,9 @@ </then> </if> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-lib"> + <macrodef name="block-lib"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -341,9 +347,9 @@ </then> </if> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-tests"> + <macrodef name="block-tests"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -396,9 +402,9 @@ </then> </if> </sequential> - </macrodef> + </macrodef> - <macrodef name="block-prepare-anteater-tests"> + <macrodef name="block-prepare-anteater-tests"> <attribute name="name"/> <attribute name="dir"/> <sequential> @@ -413,7 +419,7 @@ </then> </if> </sequential> - </macrodef> + </macrodef> <xsl:apply-templates select="module"/> </project> </xsl:template> @@ -429,12 +435,12 @@ </target> <target name="unstable" depends="init"> - <condition property="unstable.blocks.present"> - <or> - <xsl:for-each select="[EMAIL PROTECTED]'unstable']"> - <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> - <isfalse value="${{internal.exclude.block.{$block-name}}}"/> - </xsl:for-each> + <condition property="unstable.blocks.present"> + <or> + <xsl:for-each select="[EMAIL PROTECTED]'unstable']"> + <xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/> + <isfalse value="${{internal.exclude.block.{$block-name}}}"/> + </xsl:for-each> </or> </condition> <if> Modified: cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl?view=diff&r1=156992&r2=156993 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl (original) +++ cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl Thu Mar 10 13:19:04 2005 @@ -65,6 +65,14 @@ # using "build generate-blocks.properties". Any changes to blocks definitions # must be made in gump.xml, not here. +# All blocks ------------------------------------------------------------------- + +# Use this property to exclude all blocks at once +# exclude.all.blocks=true + +# Use this property to include all blocks at once +# include.all.blocks=true + </desc:desc> <desc:desc name="stable">