You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ti...@apache.org on 2004/01/03 07:35:03 UTC
cvs commit: cocoon-2.1/tools/targets init-build.xml validate-build.xml
tim 2004/01/02 22:35:03
Modified: . blocks.properties build.properties
tools/targets init-build.xml validate-build.xml
Log:
Modified build system to make it easier to control
whether the paranoid block is excluded, whether
the docs are prepared, and whether validation is
performed on the config, xdocs, and jars.
Also modified the validate.* parameters to work
like the exclude.block parameters (e.g. with
exclude.* and unless.exclude.*).
Revision Changes Path
1.53 +1 -0 cocoon-2.1/blocks.properties
Index: blocks.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- blocks.properties 19 Dec 2003 09:03:21 -0000 1.52
+++ blocks.properties 3 Jan 2004 06:35:03 -0000 1.53
@@ -44,6 +44,7 @@
#exclude.block.linkrewriter=true
#exclude.block.lucene=true
#exclude.block.naming=true
+#exclude.block.paranoid=true
#exclude.block.php=true
#exclude.block.poi=true
#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
1.32 +4 -3 cocoon-2.1/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.properties 24 Dec 2003 09:12:29 -0000 1.31
+++ build.properties 3 Jan 2004 06:35:03 -0000 1.32
@@ -16,6 +16,7 @@
# ---- Build Exclusions --------------------------------------------------------
#exclude.deprecated=true
+#exclude.documentation=true
#exclude.javadocs=true
# ---- Configuration -----------------------------------------------------------
@@ -28,9 +29,9 @@
# ---- Validation --------------------------------------------------------------
-validate.config=true
-validate.xdocs=true
-validate.jars=true
+#exclude.validate.config=true
+#exclude.validate.xdocs=true
+#exclude.validate.jars=true
# ---- Forrest -----------------------------------------------------------------
1.5 +6 -6 cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- init-build.xml 1 Jan 2004 22:41:02 -0000 1.4
+++ init-build.xml 3 Jan 2004 06:35:03 -0000 1.5
@@ -57,14 +57,14 @@
<condition property="unless.exclude.javadocs">
<istrue value="${exclude.javadocs}"/>
</condition>
- <condition property="exclude.validate.jars">
- <isfalse value="${validate.jars}"/>
+ <condition property="unless.exclude.validate.jars">
+ <istrue value="${exclude.validate.jars}"/>
</condition>
- <condition property="exclude.validate.config">
- <isfalse value="${validate.config}"/>
+ <condition property="unless.exclude.validate.config">
+ <istrue value="${exclude.validate.config}"/>
</condition>
- <condition property="exclude.validate.xdocs">
- <isfalse value="${validate.xdocs}"/>
+ <condition property="unless.exclude.validate.xdocs">
+ <istrue value="${exclude.validate.xdocs}"/>
</condition>
<filter token="Name" value="${fullname}"/>
1.3 +3 -3 cocoon-2.1/tools/targets/validate-build.xml
Index: validate-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/validate-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validate-build.xml 6 Dec 2003 02:07:12 -0000 1.2
+++ validate-build.xml 3 Jan 2004 06:35:03 -0000 1.3
@@ -1,7 +1,7 @@
<!-- === Validation targets ==================================================== -->
<!-- Check if all the JAR files are properly declared in lib/jars.xml -->
- <target name="validate-jars" depends="prepare" unless="exclude.validate.jars">
+ <target name="validate-jars" depends="prepare" unless="unless.exclude.validate.jars">
<path id="all.jars">
<fileset dir="${lib}">
<include name="**/*.jar"/>
@@ -59,7 +59,7 @@
This needs to be done at the end of the build, because the cocoon.xconf
and cocoon.roles are automatically constructed.
-->
- <target name="validate-config" depends="prepare" unless="exclude.validate.config">
+ <target name="validate-config" depends="prepare" unless="unless.exclude.validate.config">
<echo message="Validating some important configuration files"/>
<echo message="Validating cocoon.xconf using a very basic RELAX NG grammar ..."/>
@@ -69,7 +69,7 @@
</target>
<!-- Validation of xdocs -->
- <target name="validate-xdocs" depends="prepare-docs" unless="exclude.validate.xdocs">
+ <target name="validate-xdocs" depends="prepare-docs" unless="unless.exclude.validate.xdocs">
<!--
<echo message="Conducting validation of core XML documentation."/>
-->