Author: kkolinko Date: Wed Mar 10 23:36:38 2010 New Revision: 921629 URL: http://svn.apache.org/viewvc?rev=921629&view=rev Log: 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.
Modified: tomcat/trunk/build.properties.default tomcat/trunk/build.xml Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=921629&r1=921628&r2=921629&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Wed Mar 10 23:36:38 2010 @@ -105,11 +105,12 @@ nsis.loc=${base-sf.loc}/nsis/nsis-2.45.z # ----- 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 Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=921629&r1=921628&r2=921629&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Mar 10 23:36:38 2010 @@ -1737,7 +1737,8 @@ Apache Tomcat ${version} native binaries <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"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org