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

[ma...@apache.org]

Author: markt
Date: Thu Aug  1 20:11:17 2013
New Revision: 1509410

URL: http://svn.apache.org/r1509410
Log:
Fix dependencies

Modified:
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1509410&r1=1509409&r2=1509410&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug  1 20:11:17 2013
@@ -598,7 +598,7 @@
     </copy>
   </target>
 
-  <target name="compile" depends="build-prepare,compile-prepare,validate">
+  <target name="compile" depends="download-compile,validate">
     <!-- Compile internal server components -->
     <javac srcdir="java" destdir="${tomcat.classes}"
            debug="${compile.debug}"
@@ -653,7 +653,7 @@
 
   </target>
 
-  <target name="package" depends="compile,download-compile,build-manifests" >
+  <target name="package" depends="compile,build-tomcat-dbcp" >
     <!-- Common Annotations 1.0 JAR File -->
     <jarIt jarfile="${annotations-api.jar}"
       filesDir="${tomcat.classes}"
@@ -2443,7 +2443,7 @@ Apache Tomcat ${version} native binaries
 
   </target>
 
-  <target name="download-compile" depends="compile"
+  <target name="download-compile"
           description="Download (and build) components necessary to compile" >
 
     <antcall target="downloadfile-2">
@@ -2489,7 +2489,6 @@ Apache Tomcat ${version} native binaries
         <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
       </and>
     </condition>
-    <antcall target="build-tomcat-dbcp" />
 
     <!-- Download JDT (Eclipse compiler) -->
     <antcall target="downloadfile-2">



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