Author: vgritsenko
Date: Thu Mar 10 13:36:33 2005
New Revision: 156995
URL: http://svn.apache.org/viewcvs?view=rev&rev=156995
Log:
Build: Added exclude.all.blocks and include.all.blocks properties
to quickly toggle all blocks on or off.
Modified:
cocoon/trunk/blocks.properties
cocoon/trunk/status.xml
cocoon/trunk/tools/src/blocks-build.xsl
cocoon/trunk/tools/src/gump2blocks.properties.xsl
Modified: cocoon/trunk/blocks.properties
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/blocks.properties?view=diff&r1=156994&r2=156995
==============================================================================
--- cocoon/trunk/blocks.properties (original)
+++ cocoon/trunk/blocks.properties Thu Mar 10 13:36:33 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/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?view=diff&r1=156994&r2=156995
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Thu Mar 10 13:36:33 2005
@@ -429,6 +429,10 @@
</action>
</release>
<release version="2.1.7" date="TBD">
+ <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/trunk/tools/src/blocks-build.xsl
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/blocks-build.xsl?view=diff&r1=156994&r2=156995
==============================================================================
--- cocoon/trunk/tools/src/blocks-build.xsl (original)
+++ cocoon/trunk/tools/src/blocks-build.xsl Thu Mar 10 13:36:33 2005
@@ -58,30 +58,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"/>
@@ -209,9 +215,9 @@
</then>
</if>
</sequential>
- </macrodef>
+ </macrodef>
- <macrodef name="block-patch">
+ <macrodef name="block-patch">
<attribute name="name"/>
<attribute name="dir"/>
<sequential>
@@ -257,9 +263,9 @@
</sitemap-components>
-->
</sequential>
- </macrodef>
+ </macrodef>
- <macrodef name="block-roles">
+ <macrodef name="block-roles">
<attribute name="name"/>
<attribute name="dir"/>
<sequential>
@@ -267,9 +273,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>
@@ -280,9 +286,9 @@
<include name="conf/*.samplesxconf"/>
</xpatch>
</sequential>
- </macrodef>
+ </macrodef>
- <macrodef name="block-samples">
+ <macrodef name="block-samples">
<attribute name="name"/>
<attribute name="dir"/>
<sequential>
@@ -301,9 +307,9 @@
</then>
</if>
</sequential>
- </macrodef>
+ </macrodef>
- <macrodef name="block-lib">
+ <macrodef name="block-lib">
<attribute name="name"/>
<attribute name="dir"/>
<sequential>
@@ -335,9 +341,9 @@
</then>
</if>
</sequential>
- </macrodef>
+ </macrodef>
- <macrodef name="block-tests">
+ <macrodef name="block-tests">
<attribute name="name"/>
<attribute name="dir"/>
<sequential>
@@ -390,9 +396,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>
@@ -407,7 +413,7 @@
</then>
</if>
</sequential>
- </macrodef>
+ </macrodef>
<xsl:apply-templates select="module"/>
</project>
</xsl:template>
@@ -423,14 +429,14 @@
</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>
- </or>
- </condition>
+ <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>
<istrue value="${{unstable.blocks.present}}"/>
<then>
Modified: cocoon/trunk/tools/src/gump2blocks.properties.xsl
URL:
http://svn.apache.org/viewcvs/cocoon/trunk/tools/src/gump2blocks.properties.xsl?view=diff&r1=156994&r2=156995
==============================================================================
--- cocoon/trunk/tools/src/gump2blocks.properties.xsl (original)
+++ cocoon/trunk/tools/src/gump2blocks.properties.xsl Thu Mar 10 13:36:33 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">
