Fix download of commons-daemon-1.0.2:

The "destfile" parameter has to be specified for "downloadzip" task.
It specifies the file which absence triggers the download of the archive.
Thus, without it the archive was redownloaded again and again with each build.

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

diff --git a/build.properties.default b/build.properties.default
index 6c4993f..33ff744 100644 (file)
--- a/build.properties.default
+++ b/build.properties.default
@@ -105,11 +105,12 @@ nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
 # ----- Commons Daemon, version 1.0-Alpha or later -----
 commons-daemon.version=1.0.2
 commons-daemon.home=${base.path}/commons-daemon-${commons-daemon.version}
-commons-daemon.lib=${commons-daemon.home}
-commons-daemon.jar=${commons-daemon.lib}/commons-daemon-${commons-daemon.version}.jar
-commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
+commons-daemon.jar=${commons-daemon.home}/commons-daemon-${commons-daemon.version}.jar
+commons-daemon.native.win.home=${commons-daemon.home}/windows
+commons-daemon.native.win.mgr.exe=${commons-daemon.native.win.home}/prunmgr.exe
 commons-daemon.native.src.tgz=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-native-src.tar.gz
 commons-daemon.native.win.zip=${commons-daemon.home}/commons-daemon-${commons-daemon.version}-bin-windows.zip
+commons-daemon.bin.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/commons-daemon-${commons-daemon.version}-bin.tar.gz
 commons-daemon.native.src.loc=${base-commons.loc}/daemon/source/commons-daemon-${commons-daemon.version}-native-src.tar.gz
 commons-daemon.native.win.loc=${base-commons.loc}/daemon/binaries/${commons-daemon.version}/windows/commons-daemon-${commons-daemon.version}-bin-windows.zip
 

diff --git a/build.xml b/build.xml
index 8ed242b..5c878d7 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1737,7 +1737,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 
     <antcall target="downloadzip">
       <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
-      <param name="destdir" value="${commons-daemon.home}/windows"/>
+      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
+      <param name="destdir" value="${commons-daemon.native.win.home}"/>
     </antcall>
 
     <antcall target="downloadzip">