Author: markt
Date: Wed Jan 9 10:50:27 2013
New Revision: 1430776
URL: http://svn.apache.org/viewvc?rev=1430776&view=rev
Log:
Reduce the dependencies for building the source JARs
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1430771,1430773
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1430776&r1=1430775&r2=1430776&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Wed Jan 9 10:50:27 2013
@@ -943,13 +943,24 @@
<!-- 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">
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+ inheritall="false" target="build">
<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"/>
+ </target>
+ <target name="build-tomcat-jdbc-src">
+ <!-- build the jdbc-pool source jar-->
+ <echo message="Building Tomcat JDBC pool src JAR"/>
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+ inheritall="false" target="build-src">
+ <property name="tomcat.pool" value="${tomcat.pool}" />
+ <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
+ <property name="skip.download" value="set"/>
+ </ant>
</target>
<target name="examples-sources" description="Create examples sources"
@@ -2170,7 +2181,8 @@ Apache Tomcat ${version} native binaries
</target>
<!-- Packages the source code in JARs to match the binary JARs -->
- <target name="package-src-jar" depends="build-manifests">
+ <target name="package-src-jar"
+ depends="build-manifests,build-tomcat-jdbc-src">
<mkdir dir="${tomcat.src.jars}" />
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml?rev=1430776&r1=1430775&r2=1430776&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/build.xml Wed Jan 9 10:50:27 2013
@@ -136,8 +136,7 @@
<delete
file="${basedir}/src/main/java/org/apache/tomcat/jdbc/pool/package.html"/>
</target>
- <target name="build" depends="prepare,download">
- <mkdir dir="${tomcat.pool}"/>
+ <target name="build" depends="prepare,download,build-src">
<!-- compile org.apache.tomcat.jdbc-->
<javac srcdir="${basedir}/src/main/java" destdir="${tomcat.classes}"
debug="${compile.debug}"
@@ -161,7 +160,9 @@
</fileset>
<fileset refid="license.notice"/>
</jar>
+ </target>
+ <target name="build-src">
<!-- connection pool source file-->
<jar jarfile="${tomcat-jdbc-src.jar}" update="true">
<fileset dir="${basedir}/src/main/java">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
