diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /www-servers/tomcat/files | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'www-servers/tomcat/files')
3 files changed, 550 insertions, 24 deletions
diff --git a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch new file mode 100644 index 000000000000..66411238a3d8 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch @@ -0,0 +1,266 @@ +diff --git a/build.xml b/build.xml +index 19be6ed..c1557cd 100644 +--- a/build.xml ++++ b/build.xml +@@ -772,25 +772,28 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 3.1 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.servlet-api" + manifest="${tomcat.manifests}/servlet-api.jar.manifest" + notice="${tomcat.manifests}/servlet-api.jar.notice" + license="${tomcat.manifests}/servlet-api.jar.license" /> +- ++--> + <!-- EL Implementation JAR File --> ++<!-- + <jarIt jarfile="${el-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" /> +- ++--> + <!-- JSP Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> +- ++--> + <!-- WebSocket API JAR File --> + <jarIt jarfile="${websocket-api.jar}" + filesDir="${tomcat.classes}" +@@ -882,9 +885,9 @@ + meta-inf="${tomcat.manifests}/jasper.jar" /> + + <!-- Re-packaged Apache Commons DBCP 2--> +- <jarIt jarfile="${tomcat-dbcp.jar}" ++<!-- <jarIt jarfile="${tomcat-dbcp.jar}" + filesDir="${tomcat.classes}" +- filesId="files.tomcat-dbcp" /> ++ filesId="files.tomcat-dbcp" /> --> + + <!-- i18n JARs --> + <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar" +@@ -1099,9 +1102,9 @@ + + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> +- ++<!-- + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> +- ++--> + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> + <fileset dir="bin"> +@@ -1161,7 +1164,7 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> ++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -1204,7 +1207,7 @@ + + </target> + +- <target name="build-tomcat-jdbc" depends="package"> ++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> + <!-- build the jdbc-pool jar and source jar--> + <echo message="Building Tomcat JDBC pool libraries"/> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" +@@ -1220,7 +1223,7 @@ + <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> + </target> + +- <target name="build-tomcat-jdbc-src"> ++ <target name="build-tomcat-jdbc-src" unless="noget"> + <!-- build the jdbc-pool source jar--> + <echo message="Building Tomcat JDBC pool src JAR"/> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" +@@ -1323,9 +1326,11 @@ + + <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> + <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.embed}" /> ++--> + <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> + + <!-- Note the meta-inf below will work as long as there is only one JAR +@@ -1736,7 +1741,7 @@ + + <target name="extras-webservices-prepare" + depends="extras-prepare" +- description="Prepare to build web services extras package"> ++ description="Prepare to build web services extras package" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${jaxrpc-lib.loc}"/> +@@ -1921,6 +1926,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -1988,6 +1994,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++--> + <javadoc packagenames="javax.websocket.*" + sourcepath="${tomcat.dist}/src/java" + destdir="${tomcat.dist}/webapps/docs/websocketapi" +@@ -2051,13 +2058,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + <link href="../annotationapi"/> ++<!-- + <link href="../servletapi"/> + <link href="../jspapi"/> + <link href="../elapi"/> ++--> + <link href="../websocketapi"/> + <link href="../jaspicapi"/> ++<!-- + <link href="https://docs.oracle.com/javase/7/docs/api/"/> + <link href="https://docs.oracle.com/javaee/7/api/"/> ++--> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> +@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-compile" +- description="Download components necessary to compile" > ++ description="Download components necessary to compile" unless="noget" > + + <!-- Download Commons Daemon --> + <antcall target="downloadgz-2"> +@@ -2854,7 +2865,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-test-compile" +- description="Download additional components for the tests" > ++ description="Download additional components for the tests" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${junit.loc}"/> +@@ -2932,7 +2943,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-dist" +- description="Download additional components for a distribution" > ++ description="Download additional components for a distribution" unless="noget"> + + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> +@@ -2987,13 +2998,13 @@ skip.installer property in build.properties" /> + + <!-- =============== Utility Targets to support downloads ================ --> + +- <target name="setproxy" if="${proxy.use}"> ++ <target name="setproxy" if="${proxy.use}" unless="noget"> + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> + +- <target name="testexist"> ++ <target name="testexist" unless="noget"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> +@@ -3115,7 +3126,7 @@ skip.installer property in build.properties" /> + </sequential> + </macrodef> + +- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> ++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3132,7 +3143,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> ++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3157,7 +3168,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> ++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3173,7 +3184,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> ++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3197,7 +3208,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> ++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> + <!-- Download the file --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3212,7 +3223,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> ++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> + <!-- Download the file from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3240,7 +3251,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="trydownload.check" depends="setproxy"> ++ <target name="trydownload.check" depends="setproxy" unless="noget"> + <condition property="trydownload.run"> + <and> + <not> +@@ -3251,7 +3262,7 @@ skip.installer property in build.properties" /> + </condition> + </target> + +- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> ++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> + <!-- Downloads a file if not yet downloaded and the source URL is available --> + <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> + </target> +@@ -3262,7 +3273,7 @@ skip.installer property in build.properties" /> + + <target name="ide-eclipse" + depends="download-compile, extras-webservices-prepare, download-test-compile" +- description="Prepares the source tree to be built in Eclipse"> ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + <!-- Copy the sample project files into the root directory --> + <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch deleted file mode 100644 index dd002e2ca216..000000000000 --- a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java -index 4722a4a..27ce287 100644 ---- a/java/org/apache/jasper/compiler/JDTCompiler.java -+++ b/java/org/apache/jasper/compiler/JDTCompiler.java -@@ -307,7 +307,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { - } else if(opt.equals("13")) { - settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13); - } else if(opt.equals("14")) { -- settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14); -+ settings.put(CompilerOptions.OPTION_Source, "14"); - } else if(opt.equals("15")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. -@@ -368,8 +368,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler { - settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13); - settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13); - } else if(opt.equals("14")) { -- settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14); -- settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14); -+ settings.put(CompilerOptions.OPTION_TargetPlatform, "14"); -+ settings.put(CompilerOptions.OPTION_Compliance, "14"); - } else if(opt.equals("15")) { - // Constant not available in latest ECJ version shipped with - // Tomcat. May be supported in a snapshot build. diff --git a/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch new file mode 100644 index 000000000000..ab5e5e098a08 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch @@ -0,0 +1,284 @@ +diff --git a/build.xml b/build.xml +index 2958ccd..3983182 100644 +--- a/build.xml ++++ b/build.xml +@@ -1025,6 +1025,7 @@ + addOSGi="true" /> + + <!-- Servlet 4.0 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.servlet-api" +@@ -1032,21 +1033,23 @@ + notice="${tomcat.manifests}/servlet-api.jar.notice" + license="${tomcat.manifests}/servlet-api.jar.license" + addOSGi="true" /> +- ++--> + <!-- EL Implementation JAR File --> ++<!-- + <jarIt jarfile="${el-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" + addOSGi="true" /> +- ++--> + <!-- JSP Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" + addOSGi="true" /> +- ++--> + <!-- WebSocket API JAR File --> + <jarIt jarfile="${websocket-api.jar}" + filesDir="${tomcat.classes}" +@@ -1159,10 +1162,10 @@ + addOSGi="true" /> + + <!-- Re-packaged Apache Commons DBCP 2--> +- <jarIt jarfile="${tomcat-dbcp.jar}" ++<!-- <jarIt jarfile="${tomcat-dbcp.jar}" + filesDir="${tomcat.classes}" + filesId="files.tomcat-dbcp" +- addOSGi="true" /> ++ addOSGi="true" /> --> + + <!-- i18n JARs --> + <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" +@@ -1399,9 +1402,9 @@ + + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> +- ++<!-- + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> +- ++--> + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> + <fileset dir="bin"> +@@ -1461,7 +1464,7 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> ++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -1504,7 +1507,7 @@ + + </target> + +- <target name="build-tomcat-jdbc" depends="package"> ++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> + <!-- build the jdbc-pool jar and source jar--> + <echo message="Building Tomcat JDBC pool libraries"/> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" +@@ -1520,7 +1523,7 @@ + <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> + </target> + +- <target name="build-tomcat-jdbc-src"> ++ <target name="build-tomcat-jdbc-src" unless="noget"> + <!-- build the jdbc-pool source jar--> + <echo message="Building Tomcat JDBC pool src JAR"/> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" +@@ -1623,9 +1626,11 @@ + + <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> + <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.embed}" /> ++--> + <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> + + <!-- Note the meta-inf below will work as long as there is only one JAR +@@ -2208,11 +2213,12 @@ + </copy> + + <!-- Source bundles for native components --> ++<!-- + <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> +- ++--> + <!-- platform README files --> + <echo append="false" file="${tomcat.dist}/bin/x64/README"> + Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -2243,6 +2249,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -2307,6 +2314,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++--> + <javadoc packagenames="javax.websocket.*" + sourcepath="${tomcat.dist}/src/java" + destdir="${tomcat.dist}/webapps/docs/websocketapi" +@@ -2369,13 +2377,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${osgi-annotations.jar}"/> + </classpath> + <link href="../annotationapi"/> ++<!-- + <link href="../servletapi"/> + <link href="../jspapi"/> + <link href="../elapi"/> ++--> + <link href="../websocketapi"/> + <link href="../jaspicapi"/> ++<!-- + <link href="https://docs.oracle.com/javase/8/docs/api/"/> + <link href="https://javaee.github.io/javaee-spec/javadocs/"/> ++--> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> +@@ -3148,7 +3160,7 @@ skip.installer property in build.properties" /> + + <target name="download-compile" + description="Download components necessary to compile" +- depends="setup-bnd"> ++ depends="setup-bnd" unless="noget"> + + <!-- Download Commons Daemon --> + <antcall target="downloadgz-2"> +@@ -3192,7 +3204,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-test-compile" +- description="Download additional components for the tests" > ++ description="Download additional components for the tests" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${junit.loc}"/> +@@ -3270,7 +3282,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-dist" +- description="Download additional components for a distribution" > ++ description="Download additional components for a distribution" unless="noget"> + + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> +@@ -3325,13 +3337,13 @@ skip.installer property in build.properties" /> + + <!-- =============== Utility Targets to support downloads ================ --> + +- <target name="setproxy" if="${proxy.use}"> ++ <target name="setproxy" if="${proxy.use}" unless="noget"> + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> + +- <target name="testexist"> ++ <target name="testexist" unless="noget"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> +@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" /> + </sequential> + </macrodef> + +- <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy"> ++ <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist"> ++ <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3495,7 +3507,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy"> ++ <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3511,7 +3523,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist"> ++ <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy"> ++ <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy"> + <!-- Download the file --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3550,7 +3562,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist"> ++ <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist"> + <!-- Download the file from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3578,7 +3590,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="trydownload.check" depends="setproxy"> ++ <target name="trydownload.check" depends="setproxy" unless="noget"> + <condition property="trydownload.run"> + <and> + <not> +@@ -3589,7 +3601,7 @@ skip.installer property in build.properties" /> + </condition> + </target> + +- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> ++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> + <!-- Downloads a file if not yet downloaded and the source URL is available --> + <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> + </target> +@@ -3600,7 +3612,7 @@ skip.installer property in build.properties" /> + + <target name="ide-eclipse" + depends="download-compile, download-test-compile" +- description="Prepares the source tree to be built in Eclipse"> ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + <!-- Copy the sample project files into the root directory --> + <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> +@@ -3618,7 +3630,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + + <target name="ide-intellij" + depends="download-compile, download-test-compile" +- description="Creates project directory .idea for IntelliJ IDEA"> ++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> + + <copy todir="${tomcat.home}/.idea"> + <fileset dir="${tomcat.home}/res/ide-support/idea"/> |