Author: markt
Date: Thu Feb 4 21:26:41 2010
New Revision: 906654
URL: http://svn.apache.org/viewvc?rev=906654&view=rev
Log:
Invert the logic for building dbcp/jdt
a) makes more sense
b) should keep gump happy
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=906654&r1=906653&r2=906654&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Feb 4 21:26:41 2010
@@ -1658,10 +1658,8 @@
<param name="destfile" value="${commons-dbcp.home}/build.xml" />
</antcall>
<mkdir dir="${tomcat-dbcp.home}"/>
- <condition property="build.dbcp">
- <not>
- <available file="${tomcat-dbcp.jar}"/>
- </not>
+ <condition property="no.build.dbcp">
+ <available file="${tomcat-dbcp.jar}"/>
</condition>
<antcall target="build-tomcat-dbcp">
<param name="basedir" value="${tomcat-dbcp.home}" />
@@ -1674,10 +1672,8 @@
<param name="destdir" value="${base.path}"/>
</antcall>
<mkdir dir="${jasper-jdt.home}"/>
- <condition property="build.jasper-jdt">
- <not>
- <available file="${jasper-jdt.jar}"/>
- </not>
+ <condition property="no.build.jasper-jdt">
+ <available file="${jasper-jdt.jar}"/>
</condition>
<antcall target="build-jasper-jdt">
<param name="basedir" value="${jasper-jdt.home}" />
@@ -1706,7 +1702,7 @@
<!-- =============== Targets for dependencies that need to ===============
-->
<!-- ================ be built rather than used directly ================
-->
- <target name="build-tomcat-dbcp" depends="build-manifests" if="build.dbcp">
+ <target name="build-tomcat-dbcp" depends="build-manifests"
unless="no.build.dbcp">
<copy todir="${tomcat-dbcp.home}">
<fileset dir="${commons-pool.home}">
<include name="**/*.java" />
@@ -1751,7 +1747,7 @@
</target>
<target name="build-jasper-jdt" depends="build-manifests"
- if="build.jasper-jdt">
+ unless="no.build.jasper-jdt">
<unjar src="${jdt.jar}" dest="${jasper-jdt.home}" />
<jarIt jarfile="${jasper-jdt.jar}"
filesDir="${jasper-jdt.home}"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
