svn commit: r790693 - /tomcat/trunk/modules/jdbc-pool/build.xml

[fhanik]

Author: fhanik
Date: Thu Jul  2 17:35:26 2009
New Revision: 790693

URL: http://svn.apache.org/viewvc?rev=790693&view=rev
Log:
break out javadoc into its own target

Modified:
    tomcat/trunk/modules/jdbc-pool/build.xml

Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=790693&r1=790692&r2=790693&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Thu Jul  2 17:35:26 2009
@@ -85,6 +85,14 @@
     </copy>
   </target>
 
+  <target name="javadoc" depends="prepare">
+    <javadoc sourcepath="${basedir}/java" destdir="${tomcat.api}" verbose="false"/>
+    <!-- connection pool API  file-->
+    <jar jarfile="${tomcat-jdbc-api.jar}" update="true">
+      <fileset dir="${tomcat.api}"/>
+    </jar>
+  </target>
+  
   <target name="build" depends="prepare,download">
     <mkdir dir="${tomcat.pool}"/>
     <!-- compile org.apache.tomcat.jdbc-->
@@ -98,8 +106,6 @@
       <include name="org/apache/tomcat/jdbc/**" />
     </javac>
 
-    <javadoc sourcepath="${basedir}/java" destdir="${tomcat.api}" verbose="false"/>
-    
     <!-- connection pool JAR File -->
     <jar jarfile="${tomcat-jdbc.jar}" update="true">
       <fileset dir="${tomcat.classes}">
@@ -116,11 +122,6 @@
         <include name="org/apache/tomcat/jdbc/**" />
       </fileset>
     </jar>
-
-    <!-- connection pool API  file-->
-    <jar jarfile="${tomcat-jdbc-api.jar}" update="true">
-      <fileset dir="${tomcat.api}"/>
-    </jar>
   </target>
 
   <target name="build-test" depends="prepare, build, download-test">
@@ -187,7 +188,7 @@
     </xslt>  
   </target>
   
-  <target name="dist" depends="clean, build, docs">
+  <target name="dist" depends="clean, build, docs, javadoc">
     <property name="destdir" value="${tomcat.pool}/release/v${version}"/>
     <mkdir dir="${destdir}"/>
     <zip destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.zip">



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

[sebb-2-2]

On 02/07/2009, fhanik@... <fhanik@...> wrote:

> Author: fhanik
>  Date: Thu Jul  2 17:35:26 2009
>  New Revision: 790693
>
>  URL: http://svn.apache.org/viewvc?rev=790693&view=rev
>  Log:
>  break out javadoc into its own target
>
>  Modified:
>     tomcat/trunk/modules/jdbc-pool/build.xml
>
>  Modified: tomcat/trunk/modules/jdbc-pool/build.xml
>  URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=790693&r1=790692&r2=790693&view=diff
>  ==============================================================================
>  --- tomcat/trunk/modules/jdbc-pool/build.xml (original)
>  +++ tomcat/trunk/modules/jdbc-pool/build.xml Thu Jul  2 17:35:26 2009
>  @@ -85,6 +85,14 @@
>      </copy>
>    </target>
>
>  +  <target name="javadoc" depends="prepare">
>  +    <javadoc sourcepath="${basedir}/java" destdir="${tomcat.api}" verbose="false"/>

Needs classpath to avoid generating errors for 3rd party classes.

>  +    <!-- connection pool API  file-->
>  +    <jar jarfile="${tomcat-jdbc-api.jar}" update="true">
>  +      <fileset dir="${tomcat.api}"/>
>  +    </jar>
>  +  </target>
>  +
>    <target name="build" depends="prepare,download">
>      <mkdir dir="${tomcat.pool}"/>
>      <!-- compile org.apache.tomcat.jdbc-->
>  @@ -98,8 +106,6 @@
>        <include name="org/apache/tomcat/jdbc/**" />
>      </javac>
>
>  -    <javadoc sourcepath="${basedir}/java" destdir="${tomcat.api}" verbose="false"/>
>  -
>      <!-- connection pool JAR File -->
>      <jar jarfile="${tomcat-jdbc.jar}" update="true">
>        <fileset dir="${tomcat.classes}">
>  @@ -116,11 +122,6 @@
>          <include name="org/apache/tomcat/jdbc/**" />
>        </fileset>
>      </jar>
>  -
>  -    <!-- connection pool API  file-->
>  -    <jar jarfile="${tomcat-jdbc-api.jar}" update="true">
>  -      <fileset dir="${tomcat.api}"/>
>  -    </jar>
>    </target>
>
>    <target name="build-test" depends="prepare, build, download-test">
>  @@ -187,7 +188,7 @@
>      </xslt>
>    </target>
>
>  -  <target name="dist" depends="clean, build, docs">
>  +  <target name="dist" depends="clean, build, docs, javadoc">
>      <property name="destdir" value="${tomcat.pool}/release/v${version}"/>
>      <mkdir dir="${destdir}"/>
>      <zip destfile="${destdir}/apache-tomcat-jdbc-${version}-bin.zip">
>
>
>
>  ---------------------------------------------------------------------
>  To unsubscribe, e-mail: dev-unsubscribe@...
>  For additional commands, e-mail: dev-help@...
>
>

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