2013/1/7 <ma...@apache.org>:
> Author: markt
> Date: Mon Jan 7 16:01:01 2013
> New Revision: 1429864
>
> URL: http://svn.apache.org/viewvc?rev=1429864&view=rev
> Log:
> Build the missing jni and spdy source JARs
>
> Modified:
> tomcat/trunk/build.xml
>
> Modified: tomcat/trunk/build.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1429864&r1=1429863&r2=1429864&view=diff
> ==============================================================================
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Mon Jan 7 16:01:01 2013
> @@ -120,6 +120,8 @@
> <property name="catalina-tribes-src.jar"
> value="${tomcat.src.jars}/catalina-tribes-src.jar"/>
> <property name="catalina-ha-src.jar"
> value="${tomcat.src.jars}/catalina-ha-src.jar"/>
> <property name="catalina-ant-src.jar"
> value="${tomcat.src.jars}/catalina-ant-src.jar"/>
> + <property name="tomcat-jni-src.jar"
> value="${tomcat.src.jars}/tomcat-jni-src.jar"/>
> + <property name="tomcat-spdy-src.jar"
> value="${tomcat.src.jars}/tomcat-spdy-src.jar"/>
> <property name="tomcat-coyote-src.jar"
> value="${tomcat.src.jars}/tomcat-coyote-src.jar"/>
> <property name="tomcat-api-src.jar"
> value="${tomcat.src.jars}/tomcat-api-src.jar"/>
> <property name="tomcat-util-src.jar"
> value="${tomcat.src.jars}/tomcat-util-src.jar"/>
> @@ -897,7 +899,7 @@
> </xslt>
> </target>
>
> - <target name="deploy" depends="package,build-docs"
> + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc"
> description="Default. Builds a working Tomcat instance">
>
> <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
> @@ -987,7 +989,9 @@
> <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
> failonerror="false"/>
> <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
> + </target>
>
> + <target name="build-tomcat-jdbc" depends="package">
> <!-- 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">
> @@ -2239,7 +2243,7 @@ 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">
I wonder why "package-src-jar" has to depend on this new
"build-tomcat-jdbc" target.
If you care about copying the "jdbc-pool.xml" file, that action is
performed by "compile-prepare".
For example, the "validate" target depends on "compile-prepare", as
Checkstyle has to see the current copy "jdbc-pool.xml" file instead of
a stale one.
Best regards,
Konstantin Kolinko
>
> <mkdir dir="${tomcat.src.jars}" />
>
> @@ -2330,6 +2334,16 @@ Apache Tomcat ${version} native binaries
> notice="${tomcat.manifests}/tomcat-coyote.jar.notice"
> license="${tomcat.manifests}/tomcat-coyote.license" />
>
> + <!-- SPDY -->
> + <jarIt jarfile="${tomcat-spdy-src.jar}"
> + filesDir="java"
> + filesId="files.tomcat-spdy" />
> +
> + <!-- JNI -->
> + <jarIt jarfile="${tomcat-jni-src.jar}"
> + filesDir="java"
> + filesId="files.tomcat-jni" />
> +
> <!-- Jasper Implementation JAR File -->
> <jarIt jarfile="${jasper-src.jar}"
> filesDir="java"
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
