tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filip Hanik - Dev Lists <devli...@hanik.com>
Subject Re: svn commit: r1144061 - in /tomcat/trunk: build.xml modules/jdbc-pool/build.xml res/maven/mvn-pub.xml res/maven/tomcat-jdbc.pom webapps/docs/project.xml
Date Sun, 10 Jul 2011 19:05:50 GMT
On 7/10/2011 6:59 AM, Rainer Jung wrote:
> Hi Filip,
>
> On 07.07.2011 23:40, fhanik@apache.org wrote:
>> Author: fhanik
>> Date: Thu Jul  7 21:40:05 2011
>> New Revision: 1144061
>>
>> URL: http://svn.apache.org/viewvc?rev=1144061&view=rev
>> Log:
>> Include jdbc-pool into tomcat release.
>>
>> Added:
>>      tomcat/trunk/res/maven/tomcat-jdbc.pom
>> Modified:
>>      tomcat/trunk/build.xml
>>      tomcat/trunk/modules/jdbc-pool/build.xml
>>      tomcat/trunk/res/maven/mvn-pub.xml
>>      tomcat/trunk/webapps/docs/project.xml
>>
>> Modified: tomcat/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1144061&r1=1144060&r2=1144061&view=diff
>> ==============================================================================
>> --- tomcat/trunk/build.xml (original)
>> +++ tomcat/trunk/build.xml Thu Jul  7 21:40:05 2011
> ...
>> @@ -680,6 +689,12 @@
>>       <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">
>> +<!-- jdbc-pool documentation -->
>> +<filterset>
>> +<filter token="TOMCAT_PROJECT_DEST" value="project.xml"/>
>> +</filterset>
>> +</copy>
>>       <xslt basedir="webapps/docs"
>>              destdir="${tomcat.build}/webapps/docs"
>>            extension=".html"
>> @@ -691,6 +706,8 @@
>>         <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"
> Removing the file directly after generating the docs means the docs for
> jdbc-pool are build every time, even if they are still up to date.

>> @@ -840,8 +857,16 @@
>>         failonerror="false"/>
>>       <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
>>
>> -</target>
>> +<!-- 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">
>> +<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"/>
>>
>> +</target>
>> +
> Again, since you are calling clean-and-build, we will always rebuild
> jdbc-pool.
>
> Wouldn't it suffice to remove the copied docs file and to clean
> jdbc-pool during the clean target?
>
> Something along the lines of:
>
> http://people.apache.org/~rjung/patches/tomcat-jdbc-pool-build-clean.patch
you can commit, no need to ask :) trunk is still CTR
> Regards,
>
> Rainer
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>


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


Mime
View raw message