Don't build dbcp or jdt unless we have to. This allows adding download as a dep to...

svn co...
ant release

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@905793 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index c861cbc..aeb529a 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <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 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <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 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
   <!-- =============== 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 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
          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}"