Reorganize jdbc-pool inclusion in releases.

Split build (code and docs) from clean.

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

diff --git a/build.xml b/build.xml
index ab092b1..314bd5d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -689,7 +689,7 @@
     <mkdir dir="${tomcat.build}/webapps/docs/funcspecs" />
 
     <!-- XSL processing -->
-    <copy tofile="webapps/docs/jdbc-pool.xml" file="${tomcat.jdbc.dir}/doc/jdbc-pool.xml" overwrite="true">
+    <copy tofile="webapps/docs/jdbc-pool.xml" file="${tomcat.jdbc.dir}/doc/jdbc-pool.xml">
       <!-- jdbc-pool documentation -->
       <filterset>
         <filter token="TOMCAT_PROJECT_DEST" value="project.xml"/>
@@ -706,8 +706,6 @@
       <param name="build-date" expression="${today}"/>
       <param name="year" expression="${year}"/>
     </xslt>
-    <!-- remove jdbc-pool documentation -->
-    <delete file="webapps/docs/jdbc-pool.xml"/>
     <xslt basedir="webapps/docs/appdev"
            destdir="${tomcat.build}/webapps/docs/appdev"
          extension=".html"
@@ -859,11 +857,11 @@
 
     <!-- build the jdbc-pool jar and source jar-->
     <echo message="Building Tomcat JDBC pool libraries"/>
-    <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="clean-and-build">
+    <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="build">
       <property name="tomcat.juli.jar" value="${tomcat-juli.jar}"></property>
       <property name="skip.download" value="set"/>
     </ant>
-    <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib" overwrite="true"/>
+    <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
 
   </target>
   
@@ -2146,6 +2144,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     <delete dir="${tomcat.output}" />
     <!-- Remove the copied catalina.properties -->
     <delete file="java/org/apache/catalina/startup/catalina.properties" />
+    <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="clean">
+    </ant>
+    <!-- remove jdbc-pool documentation -->
+    <delete file="webapps/docs/jdbc-pool.xml"/>
   </target>