Author: markt
Date: Tue Feb 9 10:24:37 2010
New Revision: 907991
URL: http://svn.apache.org/viewvc?rev=907991&view=rev
Log:
Split out the download target so only dependencies for the current target are
downloaded rather than everything
Move the bayeux download to the bayeux build file
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml
tomcat/trunk/modules/bayeux/build.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=907991&r1=907990&r2=907991&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Tue Feb 9 10:24:37 2010
@@ -105,18 +105,19 @@
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
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=907991&r1=907990&r2=907991&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Feb 9 10:24:37 2010
@@ -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 @@
<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 @@
<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 @@
<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 @@
<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="${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="${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/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 ================
-->
Modified: tomcat/trunk/modules/bayeux/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/build.xml?rev=907991&r1=907990&r2=907991&view=diff
==============================================================================
--- tomcat/trunk/modules/bayeux/build.xml (original)
+++ tomcat/trunk/modules/bayeux/build.xml Tue Feb 9 10:24:37 2010
@@ -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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
