Author: markt
Date: Tue Feb 2 21:01:45 2010
New Revision: 905793
URL: http://svn.apache.org/viewvc?rev=905793&view=rev
Log:
Don't build dbcp or jdt unless we have to. This allows adding download as a dep to compile. You can now do:
svn co...
ant release
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=905793&r1=905792&r2=905793&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Feb 2 21:01:45 2010
@@ -362,7 +362,7 @@
</target>
- <target name="compile" depends="build-prepare">
+ <target name="compile" depends="build-prepare,download">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
@@ -1658,6 +1658,11 @@
<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>
<antcall target="build-tomcat-dbcp">
<param name="basedir" value="${tomcat-dbcp.home}" />
</antcall>
@@ -1669,6 +1674,11 @@
<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>
<antcall target="build-jasper-jdt">
<param name="basedir" value="${jasper-jdt.home}" />
</antcall>
@@ -1696,7 +1706,7 @@
<!-- =============== Targets for dependencies that need to =============== -->
<!-- ================ be built rather than used directly ================ -->
- <target name="build-tomcat-dbcp" depends="build-manifests" >
+ <target name="build-tomcat-dbcp" depends="build-manifests" if="build.dbcp">
<copy todir="${tomcat-dbcp.home}">
<fileset dir="${commons-pool.home}">
<include name="**/*.java" />
@@ -1740,7 +1750,8 @@
filesId="files.tomcat-dbcp" />
</target>
- <target name="build-jasper-jdt" depends="build-manifests" >
+ <target name="build-jasper-jdt" depends="build-manifests"
+ if="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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org