vgritsenko 2003/06/06 05:55:07
Modified: src/targets init-build.xml
Log:
improve exclude conditions
Revision Changes Path
1.13 +12 -3 cocoon-2.1/src/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/targets/init-build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- init-build.xml 2 May 2003 06:53:08 -0000 1.12
+++ init-build.xml 6 Jun 2003 12:55:07 -0000 1.13
@@ -42,13 +42,22 @@
<istrue value="${exclude.webapp.documentation}"/>
</condition>
<condition property="unless.exclude.webapp.javadocs">
- <istrue value="${exclude.webapp.javadocs}"/>
+ <or>
+ <istrue value="${exclude.javadocs}"/>
+ <istrue value="${exclude.webapp.javadocs}"/>
+ </or>
</condition>
<condition property="unless.exclude.webapp.idldocs">
- <istrue value="${exclude.webapp.idldocs}"/>
+ <or>
+ <istrue value="${exclude.idldocs}"/>
+ <istrue value="${exclude.webapp.idldocs}"/>
+ </or>
</condition>
<condition property="unless.exclude.webapp.scratchpad">
- <istrue value="${exclude.webapp.scratchpad}"/>
+ <or>
+ <istrue value="${exclude.scratchpad}"/>
+ <istrue value="${exclude.webapp.scratchpad}"/>
+ </or>
</condition>
<condition property="unless.exclude.webapp.samples">
<istrue value="${exclude.webapp.samples}"/>
