huber 2003/03/10 16:02:19
Modified: . build.xml
Log:
Use unless.exclude.XXX shadow props instead of exclude.XXX in the
unless target attributes, toggle exclude.XXX in the props to true, or false
Revision Changes Path
1.5 +32 -10 cocoon-2.1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 10 Mar 2003 18:22:18 -0000 1.4
+++ build.xml 11 Mar 2003 00:02:18 -0000 1.5
@@ -54,6 +54,28 @@
<!-- Get the block properties from an external file -->
<property file="blocks.properties"/>
+ <!-- Use unless.exclude.XXX shadow props used in the
+ unless target attributes -->
+ <condition property="unless.exclude.webapp.documentation">
+ <istrue value="${exclude.webapp.documentation}"/>
+ </condition>
+ <condition property="unless.exclude.webapp.javadocs">
+ <istrue value="${exclude.webapp.javadocs}"/>
+ </condition>
+ <condition property="unless.exclude.webapp.scratchpad">
+ <istrue value="${exclude.webapp.scratchpad}"/>
+ </condition>
+ <condition property="unless.exclude.webapp.samples">
+ <istrue value="${exclude.webapp.samples}"/>
+ </condition>
+
+ <condition property="unless.exclude.scratchpad">
+ <istrue value="${exclude.scratchpad}"/>
+ </condition>
+ <condition property="unless.exclude.deprecated">
+ <istrue value="${exclude.deprecated}"/>
+ </condition>
+
<filter token="Name" value="${fullname}"/>
<filter token="name" value="${fullname}"/>
<filter token="year" value="${year}"/>
@@ -210,7 +232,7 @@
</target>
<!-- compiles the scratchpad -->
- <target name="compile-scratchpad" depends="prepare" unless="exclude.scratchpad">
+ <target name="compile-scratchpad" depends="prepare"
unless="unless.exclude.scratchpad">
<mkdir dir="${build.scratchpad.src}"/>
<mkdir dir="${build.scratchpad.dest}"/>
@@ -245,7 +267,7 @@
</target>
<!-- compiles deprecated code -->
- <target name="compile-deprecated" depends="prepare,init-xpatch"
unless="exclude.deprecated">
+ <target name="compile-deprecated" depends="prepare,init-xpatch"
unless="unless.exclude.deprecated">
<mkdir dir="${build.deprecated}"/>
<xpatch configuration="${build.dest}/org/apache/cocoon/cocoon.roles"
@@ -281,14 +303,14 @@
</target>
<!-- package the scratchpad -->
- <target name="package-scratchpad" depends="compile-scratchpad"
unless="exclude.scratchpad">
+ <target name="package-scratchpad" depends="compile-scratchpad"
unless="unless.exclude.scratchpad">
<jar jarfile="${build}/${name}-scratchpad.jar">
<fileset dir="${build.scratchpad}"/>
</jar>
</target>
<!-- package deprecated code -->
- <target name="package-deprecated" depends="compile-deprecated"
unless="exclude.deprecated">
+ <target name="package-deprecated" depends="compile-deprecated"
unless="unless.exclude.deprecated">
<jar jarfile="${build}/${name}-deprecated.jar">
<fileset dir="${build.deprecated}"/>
</jar>
@@ -524,7 +546,7 @@
<!-- Samples Targets ======================================================= -->
- <target name="samples" depends="prepare, init-xpatch"
unless="exclude.webapp.samples">
+ <target name="samples" depends="prepare, init-xpatch"
unless="unless.exclude.webapp.samples">
<mkdir dir="${build.samples}"/>
<javac srcdir="${samples}"
@@ -567,7 +589,7 @@
</target>
- <target name="block-samples" depends="prepare" unless="exclude.webapp.samples">
+ <target name="block-samples" depends="prepare"
unless="unless.exclude.webapp.samples">
<ant antfile="${build.temp}/blocks-build.xml"
inheritAll="true"
inheritRefs="false"
@@ -637,15 +659,15 @@
target="patch"/>
</target>
- <target name="prepare-webapp-samples" depends="prepare-webapp, samples,
block-samples" unless="exclude.webapp.samples">
+ <target name="prepare-webapp-samples" depends="prepare-webapp, samples,
block-samples" unless="unless.exclude.webapp.samples">
</target>
- <target name="prepare-webapp-deprecated" depends="prepare-webapp,init-xpatch"
unless="exclude.deprecated">
+ <target name="prepare-webapp-deprecated" depends="prepare-webapp,init-xpatch"
unless="unless.exclude.deprecated">
<copy file="${build}/${name}-deprecated.jar"
tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
<xpatch directory="${deprecated.conf}" extension="xconf"
configuration="${build.webapp}/WEB-INF/cocoon.xconf"/>
</target>
- <target name="prepare-webapp-docs" depends="init"
unless="exclude.webapp.documentation">
+ <target name="prepare-webapp-docs" depends="init"
unless="unless.exclude.webapp.documentation">
<copy todir="${build.webapp}/documentation">
<fileset dir="${src}/documentation"/>
</copy>
