svn commit: r1201508 - /tomcat/trunk/build.xml

[kk...@apache.org]

Author: kkolinko
Date: Sun Nov 13 20:50:33 2011
New Revision: 1201508

URL: http://svn.apache.org/viewvc?rev=1201508&view=rev
Log:
When building jdbc-pool from within Tomcat, make it to use Tomcat's output directory.
This allows it to respect redefined value of tomcat.output property, moving all output outside the source tree.
The new subdirectory used for jdbc-pool build is "output/jdbc-pool".

Modified:
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1201508&r1=1201507&r2=1201508&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Sun Nov 13 20:50:33 2011
@@ -71,6 +71,8 @@
   <property name="test.apr.loc"          value="${tomcat.build}/bin/native"/>
   <!-- base directory for jdbc-pool -->
   <property name="tomcat.jdbc.dir"       value="${basedir}/modules/jdbc-pool"/>
+  <!-- build output directory for jdbc-pool -->
+  <property name="tomcat.pool"           value="${tomcat.output}/jdbc-pool"/>
 
   <!-- Servlet 3.0 spec requires 1.6+ -->
   <property name="compile.source" value="1.6"/>
@@ -144,8 +146,8 @@
   <property name="tomcat-embed-log4j-src.jar" value="${tomcat.embed.sources}/tomcat-embed-logging-log4j-src.jar"/>
 
   <!-- jdbc-pool JARs & source JARs -->
-  <property name="tomcat-jdbc.jar" value="${tomcat.jdbc.dir}/output/tomcat-jdbc.jar"/>
-  <property name="tomcat-jdbc-src.jar" value="${tomcat.jdbc.dir}/output/tomcat-jdbc-src.jar"/>
+  <property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
+  <property name="tomcat-jdbc-src.jar" value="${tomcat.pool}/tomcat-jdbc-src.jar"/>
 
 
   <!-- Tests To Run -->
@@ -860,7 +862,8 @@
     <!-- 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="build">
-      <property name="tomcat.juli.jar" value="${tomcat-juli.jar}"></property>
+      <property name="tomcat.pool" value="${tomcat.pool}" />
+      <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
       <property name="skip.download" value="set"/>
     </ant>
     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
@@ -2149,6 +2152,7 @@ Apache Tomcat ${version} native binaries
     <!-- 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">
+      <property name="tomcat.pool" value="${tomcat.pool}" />
     </ant>
     <!-- remove jdbc-pool documentation -->
     <delete file="webapps/docs/jdbc-pool.xml"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org