Split out the download target so only dependencies for the current target are downloa...

Move the bayeux download to the bayeux build file

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907991 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.properties.default b/build.properties.default
index 1a34fc1..968d5dc 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -105,18 +105,19 @@ commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
 commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
 commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
 
-# ----- JSON Libraries, 
+# ----- JUnit Unit Test Suite, version 3.7 or later -----
+junit.home=${base.path}/junit3.8.2
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.loc=${base-sf.loc}/junit/junit3.8.2.zip
+
+# ----- JSON Libraries (for bayeux module) -----
 json-lib.home=${base.path}/json-20080701
 json-lib.lib=http://repo1.maven.org/maven2/org/json/json/20080701/json-20080701.jar
 json-lib.jar=json.jar
 
-# ----- Dojo Toolkit 
+# ----- Dojo Toolkit (for bayeux module) -----
 dojo-js.home=${base.path}/dojo-release-1.1.1
 dojo-js.loc=http://download.dojotoolkit.org/release-1.1.1/dojo-release-1.1.1.tar.gz
 dojo-js.jar=${dojo-js.home}/dojo/dojo.js
 
-# ----- JUnit Unit Test Suite, version 3.7 or later -----
-junit.home=${base.path}/junit3.8.2
-junit.lib=${junit.home}
-junit.jar=${junit.lib}/junit.jar
-junit.loc=${base-sf.loc}/junit/junit3.8.2.zip

diff --git a/build.xml b/build.xml
index a8e6737..35ec7ff 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -362,7 +362,7 @@
 
   </target>
 
-  <target name="compile" depends="build-prepare,download">
+  <target name="compile" depends="build-prepare,download-compile">
 
     <!-- Compile internal server components -->
     <javac srcdir="java" destdir="${tomcat.classes}"
@@ -827,7 +827,7 @@
 
   </target>
 
-  <target name="test-compile" depends="compile" >
+  <target name="test-compile" depends="compile,download-test-compile" >
     <mkdir dir="${test.classes}"/>
     <!-- Compile -->
     <javac srcdir="test" destdir="${test.classes}"
@@ -1051,7 +1051,7 @@
     </antcall>
   </target>
 
-  <target name="dist-prepare">
+  <target name="dist-prepare" depends="download-dist">
     <!-- This is why releasing must be done on Windows / with wine:
          otherwise this check fails and the .exe distro is not generated -->
     <condition property="execute.installer">
@@ -1622,9 +1622,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
     <delete dir="${tomcat.output}" />
   </target>
 
-  <!-- Download and dependency building -->
-  <target name="download"
-          description="Download (and build as necessary) dependent components" >
+       
+  <!-- ================ Download and dependency building =================== -->
+
+  <target name="download-compile"
+             description="Download (and build) components necessary to compile" >
 
     <antcall target="downloadfile">
       <param name="sourcefile" value="${tomcat-native.loc}"/>
@@ -1632,24 +1634,6 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.dll.win32}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.dll.x64}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
-      <param name="destfile" value="${tomcat-native.dll.i64}"/>
-      <param name="destdir" value="${tomcat-native.home}"/>
-    </antcall>
-
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-daemon.loc}"/>
       <param name="destfile" value="${commons-daemon.jar}"/>
@@ -1665,14 +1649,14 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <param name="destfile" value="${commons-dbcp.home}/build.xml" />
     </antcall>
     <mkdir dir="${tomcat-dbcp.home}"/>
-       <condition property="no.build.dbcp">
+    <condition property="no.build.dbcp">
       <available file="${tomcat-dbcp.jar}"/>
     </condition>
     <antcall target="build-tomcat-dbcp">
       <param name="basedir" value="${tomcat-dbcp.home}" />
     </antcall>
 
-    <!-- Dpwnload src and build Jasper JDT bundle -->
+    <!-- Download src and build Jasper JDT bundle -->
     <antcall target="downloadzip">
       <param name="sourcefile" value="${jdt.loc}"/>
       <param name="destfile" value="${jdt.jar}"/>
@@ -1686,26 +1670,49 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
       <param name="basedir" value="${jasper-jdt.home}" />
     </antcall>
 
+  </target>
+
+  <target name="download-test-compile"
+          description="Download additional components for the tests" >
+
     <antcall target="downloadzip">
-      <param name="sourcefile" value="${nsis.loc}"/>
-      <param name="destfile" value="${nsis.exe}"/>
-      <param name="destdir" value="${nsis.home}/.."/>
+      <param name="sourcefile" value="${junit.loc}"/>
+      <param name="destfile" value="${junit.jar}"/>
+      <param name="destdir" value="${base.path}"/>
+    </antcall>
+
+  </target>
+
+  <target name="download-dist"
+          description="Download additional components for a distribution" >
+
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
+      <param name="destfile" value="${tomcat-native.dll.win32}"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
     <antcall target="downloadfile">
-      <param name="sourcefile" value="${json-lib.lib}"/>
-      <param name="destfile" value="${json-lib.home}/${json-lib.jar}"/>
-      <param name="destdir" value="${json-lib.home}"/>
+      <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
+      <param name="destfile" value="${tomcat-native.dll.x64}"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
+    </antcall>
+
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
+      <param name="destfile" value="${tomcat-native.dll.i64}"/>
+      <param name="destdir" value="${tomcat-native.home}"/>
     </antcall>
 
     <antcall target="downloadzip">
-      <param name="sourcefile" value="${junit.loc}"/>
-      <param name="destfile" value="${junit.jar}"/>
-      <param name="destdir" value="${base.path}"/>
+      <param name="sourcefile" value="${nsis.loc}"/>
+      <param name="destfile" value="${nsis.exe}"/>
+      <param name="destdir" value="${nsis.home}/.."/>
     </antcall>
 
   </target>
 
+
   <!-- =============== Targets for dependencies that need to =============== -->
   <!-- ================  be built rather than used directly ================ -->
 

diff --git a/modules/bayeux/build.xml b/modules/bayeux/build.xml
index 348bf96..d4af122 100644 (file)
--- a/modules/bayeux/build.xml
+++ b/modules/bayeux/build.xml
@@ -79,6 +79,12 @@
        <target name="bayeux">
     <mkdir dir="${tomcat.extras}"/>
 
+    <antcall target="downloadfile">
+      <param name="sourcefile" value="${json-lib.lib}"/>
+      <param name="destfile" value="${json-lib.home}/${json-lib.jar}"/>
+      <param name="destdir" value="${json-lib.home}"/>
+    </antcall>
+
     <antcall target="downloadgz">
       <param name="sourcefile" value="${dojo-js.loc}"/>
       <param name="destfile" value="${dojo-js.jar}"/>