This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new de3a101 Add the option for distributions to disable dependency
downloads
de3a101 is described below
commit de3a101b24bbd5e79283a822ea7b64cc11286267
Author: remm <r...@apache.org>
AuthorDate: Fri Mar 5 10:29:18 2021 +0100
Add the option for distributions to disable dependency downloads
The dependencies will still be checked but no download will actually
occur. This allows a distribution to provide its own built binaries
while making sure no other ones are included.
---
build.properties.default | 1 +
build.xml | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f7d8f4b..4d2a90a 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -36,6 +36,7 @@ git.branch=master
# Note enabling validation uses Checkstyle which is LGPL licensed
ant.version.required=1.9.8
execute.validate=false
+execute.download=true
execute.test.nio=true
execute.test.nio2=true
# Still requires APR/native library to be present
diff --git a/build.xml b/build.xml
index a4c9d05..8338af0 100644
--- a/build.xml
+++ b/build.xml
@@ -3411,7 +3411,7 @@ skip.installer property in build.properties" />
</sequential>
</macrodef>
- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
+ <target name="downloadgz" unless="exist" if="${execute.download}"
depends="testexist,setproxy">
<!-- Download and extract the package -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3428,7 +3428,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}.tar.gz"/>
</target>
- <target name="downloadgz-2" unless="exist" depends="testexist">
+ <target name="downloadgz-2" unless="exist" if="${execute.download}"
depends="testexist">
<!-- Download and extract the package from the two alternative locations
-->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3453,7 +3453,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}.tar.gz"/>
</target>
- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
+ <target name="downloadzip" unless="exist" if="${execute.download}"
depends="testexist,setproxy">
<!-- Download and extract the package -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3469,7 +3469,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}"/>
</target>
- <target name="downloadzip-2" unless="exist" depends="testexist">
+ <target name="downloadzip-2" unless="exist" if="${execute.download}"
depends="testexist">
<!-- Download and extract the package from the two alternative locations
-->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3493,7 +3493,7 @@ skip.installer property in build.properties" />
<delete file="${temp.file}"/>
</target>
- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
+ <target name="downloadfile" unless="exist" if="${execute.download}"
depends="testexist,setproxy">
<!-- Download the file -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
@@ -3508,7 +3508,7 @@ skip.installer property in build.properties" />
<move file="${temp.file}" tofile="${destfile}"/>
</target>
- <target name="downloadfile-2" unless="exist" depends="testexist">
+ <target name="downloadfile-2" unless="exist" if="${execute.download}"
depends="testexist">
<!-- Download the file from the two alternative locations -->
<local name="temp.file"/>
<mkdir dir="${base.path}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
