Author: markt
Date: Thu Dec 14 18:45:25 2017
New Revision: 1818184
URL: http://svn.apache.org/viewvc?rev=1818184&view=rev
Log:
Follow-up to r1818179
Only download native source bundles when we need them.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1818184&r1=1818183&r2=1818184&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Dec 14 18:45:25 2017
@@ -2619,13 +2619,6 @@ skip.installer property in build.propert
<target name="download-compile"
description="Download (and build) components necessary to compile" >
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
- <param name="destdir" value="${tomcat-native.home}"/>
- </antcall>
-
<!-- Download Commons Daemon -->
<antcall target="downloadgz-2">
<param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
@@ -2633,13 +2626,6 @@ skip.installer property in build.propert
<param name="destfile" value="${commons-daemon.jar}"/>
</antcall>
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
- <param name="destdir" value="${commons-daemon.home}"/>
- </antcall>
-
<!-- Download JDT (Eclipse compiler) -->
<antcall target="downloadfile-2">
<param name="sourcefile.1" value="${jdt.loc.1}"/>
@@ -2710,6 +2696,13 @@ skip.installer property in build.propert
<target name="download-dist"
description="Download additional components for a distribution" >
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+ <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
+ <param name="destfile" value="${tomcat-native.tar.gz}"/>
+ <param name="destdir" value="${tomcat-native.home}"/>
+ </antcall>
+
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
<param name="sourcefile.2" value="${tomcat-native.win.2}"/>
@@ -2717,6 +2710,13 @@ skip.installer property in build.propert
<param name="destdir" value="${tomcat-native.home}"/>
</antcall>
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
+ <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
+ <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
+ <param name="destdir" value="${commons-daemon.home}"/>
+ </antcall>
+
<antcall target="downloadzip-2">
<param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
<param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
