1 |
commit: 4b515b99de1aaeb28010266127b80664e242262f |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 5 16:54:11 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 11 04:46:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b515b99 |
7 |
|
8 |
www-servers/tomcat: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/11270 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
.../tomcat/files/tomcat-8.0.49-build.xml.patch | 265 --------------------- |
15 |
.../tomcat/files/tomcat-8.5.27-build.xml.patch | 256 -------------------- |
16 |
2 files changed, 521 deletions(-) |
17 |
|
18 |
diff --git a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch |
19 |
deleted file mode 100644 |
20 |
index ab6590d5c12..00000000000 |
21 |
--- a/www-servers/tomcat/files/tomcat-8.0.49-build.xml.patch |
22 |
+++ /dev/null |
23 |
@@ -1,265 +0,0 @@ |
24 |
---- a/build.xml |
25 |
-+++ b/build.xml |
26 |
-@@ -718,24 +718,29 @@ |
27 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
28 |
- |
29 |
- <!-- Servlet 3.1 Implementation JAR File --> |
30 |
-+<!-- |
31 |
- <jarIt jarfile="${servlet-api.jar}" |
32 |
- filesDir="${tomcat.classes}" |
33 |
- filesId="files.servlet-api" |
34 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
35 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
36 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
37 |
-- |
38 |
-+--> |
39 |
- <!-- JSP 2.3 Implementation JAR File --> |
40 |
-+<!-- |
41 |
- <jarIt jarfile="${jsp-api.jar}" |
42 |
- filesDir="${tomcat.classes}" |
43 |
- filesId="files.jsp-api" |
44 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
45 |
-+--> |
46 |
- |
47 |
- <!-- EL 3.0 Implementation JAR File --> |
48 |
-+<!-- |
49 |
- <jarIt jarfile="${el-api.jar}" |
50 |
- filesDir="${tomcat.classes}" |
51 |
- filesId="files.el-api" |
52 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
53 |
-+--> |
54 |
- |
55 |
- <!-- WebSocket 1.1 API JAR File --> |
56 |
- <jarIt jarfile="${websocket-api.jar}" |
57 |
-@@ -1005,9 +1010,9 @@ |
58 |
- |
59 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
60 |
- description="Default. Builds a working Tomcat instance"> |
61 |
-- |
62 |
-+<!-- |
63 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
64 |
-- |
65 |
-+--> |
66 |
- <!-- Copy scripts --> |
67 |
- <copy todir="${tomcat.build}/bin"> |
68 |
- <fileset dir="bin"> |
69 |
-@@ -1067,7 +1072,7 @@ |
70 |
- <exclude name="${jdt.jar.filename}"/> |
71 |
- </fileset> |
72 |
- </delete> |
73 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
74 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
75 |
- |
76 |
- <!-- Add sources for examples --> |
77 |
- <antcall target="examples-sources" /> |
78 |
-@@ -1101,7 +1106,7 @@ |
79 |
- </javac> |
80 |
- </target> |
81 |
- |
82 |
-- <target name="build-tomcat-jdbc" depends="package"> |
83 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
84 |
- <!-- build the jdbc-pool jar and source jar--> |
85 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
86 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
87 |
-@@ -1116,7 +1121,7 @@ |
88 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
89 |
- </target> |
90 |
- |
91 |
-- <target name="build-tomcat-jdbc-src"> |
92 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
93 |
- <!-- build the jdbc-pool source jar--> |
94 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
95 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
96 |
-@@ -1220,9 +1225,11 @@ |
97 |
- |
98 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
99 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
100 |
-+<!-- |
101 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
102 |
- failonerror="false"/> |
103 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
104 |
-+--> |
105 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
106 |
- |
107 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
108 |
-@@ -1615,7 +1622,7 @@ |
109 |
- |
110 |
- <target name="extras-commons-logging-prepare" |
111 |
- depends="extras-prepare" |
112 |
-- description="Prepare to build web services extras package"> |
113 |
-+ description="Prepare to build web services extras package" unless="noget"> |
114 |
- |
115 |
- <antcall target="downloadfile-2"> |
116 |
- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> |
117 |
-@@ -1754,7 +1761,7 @@ |
118 |
- |
119 |
- <target name="extras-webservices-prepare" |
120 |
- depends="extras-prepare" |
121 |
-- description="Prepare to build web services extras package"> |
122 |
-+ description="Prepare to build web services extras package" unless="noget"> |
123 |
- |
124 |
- <antcall target="downloadfile"> |
125 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
126 |
-@@ -1941,11 +1948,12 @@ |
127 |
- </copy> |
128 |
- |
129 |
- <!-- Source bundles for native components --> |
130 |
-+<!-- |
131 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
132 |
- file="${tomcat-native.tar.gz}" /> |
133 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
134 |
- file="${commons-daemon.native.src.tgz}" /> |
135 |
-- |
136 |
-+--> |
137 |
- <!-- platform README files --> |
138 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
139 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
140 |
-@@ -1955,6 +1963,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
141 |
- |
142 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
143 |
- description="Create the Tomcat javadoc" > |
144 |
-+<!-- |
145 |
- <javadoc packagenames="javax.servlet.*" |
146 |
- excludepackagenames="javax.servlet.jsp.*" |
147 |
- sourcepath="${tomcat.dist}/src/java" |
148 |
-@@ -2016,6 +2025,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
149 |
- <path location="${ant.core.lib}"/> |
150 |
- </classpath> |
151 |
- </javadoc> |
152 |
-+--> |
153 |
- <javadoc packagenames="javax.websocket.*" |
154 |
- sourcepath="${tomcat.dist}/src/java" |
155 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
156 |
-@@ -2054,9 +2064,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
157 |
- <path refid="tomcat.webservices.classpath"/> |
158 |
- <path location="${ant.core.lib}"/> |
159 |
- </classpath> |
160 |
-+<!-- |
161 |
- <link href="../servletapi"/> |
162 |
- <link href="../jspapi"/> |
163 |
- <link href="../elapi"/> |
164 |
-+--> |
165 |
- <link href="../websocketapi"/> |
166 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
167 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
168 |
-@@ -2791,7 +2803,7 @@ skip.installer property in build.properties" /> |
169 |
- </target> |
170 |
- |
171 |
- <target name="download-compile" |
172 |
-- description="Download (and build) components necessary to compile" > |
173 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
174 |
- |
175 |
- <!-- Download Commons Daemon --> |
176 |
- <antcall target="downloadgz-2"> |
177 |
-@@ -2811,7 +2823,7 @@ skip.installer property in build.properties" /> |
178 |
- </target> |
179 |
- |
180 |
- <target name="download-test-compile" |
181 |
-- description="Download additional components for the tests" > |
182 |
-+ description="Download additional components for the tests" unless="noget"> |
183 |
- |
184 |
- <antcall target="downloadfile"> |
185 |
- <param name="sourcefile" value="${junit.loc}"/> |
186 |
-@@ -2868,7 +2880,7 @@ skip.installer property in build.properties" /> |
187 |
- </target> |
188 |
- |
189 |
- <target name="download-dist" |
190 |
-- description="Download additional components for a distribution" > |
191 |
-+ description="Download additional components for a distribution" unless="noget"> |
192 |
- |
193 |
- <antcall target="downloadfile-2"> |
194 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
195 |
-@@ -2908,18 +2920,18 @@ skip.installer property in build.properties" /> |
196 |
- |
197 |
- <!-- =============== Utility Targets to support downloads ================ --> |
198 |
- |
199 |
-- <target name="setproxy" if="${proxy.use}"> |
200 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
201 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
202 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
203 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
204 |
- </target> |
205 |
- |
206 |
-- <target name="testexist"> |
207 |
-+ <target name="testexist" unless="noget"> |
208 |
- <echo message="Testing for ${destfile}"/> |
209 |
- <available file="${destfile}" property="exist"/> |
210 |
- </target> |
211 |
- |
212 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
213 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
214 |
- <!-- Download and extract the package --> |
215 |
- <local name="temp.file"/> |
216 |
- <mkdir dir="${base.path}"/> |
217 |
-@@ -2931,7 +2943,7 @@ skip.installer property in build.properties" /> |
218 |
- <delete file="${temp.file}.tar.gz"/> |
219 |
- </target> |
220 |
- |
221 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
222 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
223 |
- <!-- Download and extract the package from the two alternative locations --> |
224 |
- <local name="temp.file"/> |
225 |
- <mkdir dir="${base.path}"/> |
226 |
-@@ -2950,7 +2962,7 @@ skip.installer property in build.properties" /> |
227 |
- <delete file="${temp.file}.tar.gz"/> |
228 |
- </target> |
229 |
- |
230 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
231 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
232 |
- <!-- Download and extract the package --> |
233 |
- <local name="temp.file"/> |
234 |
- <mkdir dir="${base.path}"/> |
235 |
-@@ -2961,7 +2973,7 @@ skip.installer property in build.properties" /> |
236 |
- <delete file="${temp.file}"/> |
237 |
- </target> |
238 |
- |
239 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
240 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
241 |
- <!-- Download and extract the package from the two alternative locations --> |
242 |
- <local name="temp.file"/> |
243 |
- <mkdir dir="${base.path}"/> |
244 |
-@@ -2979,7 +2991,7 @@ skip.installer property in build.properties" /> |
245 |
- <delete file="${temp.file}"/> |
246 |
- </target> |
247 |
- |
248 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
249 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
250 |
- <!-- Download the file --> |
251 |
- <local name="temp.file"/> |
252 |
- <mkdir dir="${base.path}"/> |
253 |
-@@ -2989,7 +3001,7 @@ skip.installer property in build.properties" /> |
254 |
- <move file="${temp.file}" tofile="${destfile}"/> |
255 |
- </target> |
256 |
- |
257 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
258 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
259 |
- <!-- Download the file from the two alternative locations --> |
260 |
- <local name="temp.file"/> |
261 |
- <mkdir dir="${base.path}"/> |
262 |
-@@ -3012,7 +3024,7 @@ skip.installer property in build.properties" /> |
263 |
- <move file="${temp.file}" tofile="${destfile}"/> |
264 |
- </target> |
265 |
- |
266 |
-- <target name="trydownload.check" depends="setproxy"> |
267 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
268 |
- <condition property="trydownload.run"> |
269 |
- <and> |
270 |
- <not> |
271 |
-@@ -3023,7 +3035,7 @@ skip.installer property in build.properties" /> |
272 |
- </condition> |
273 |
- </target> |
274 |
- |
275 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
276 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
277 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
278 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
279 |
- </target> |
280 |
-@@ -3034,7 +3046,7 @@ skip.installer property in build.properties" /> |
281 |
- |
282 |
- <target name="ide-eclipse" |
283 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
284 |
-- description="Prepares the source tree to be built in Eclipse"> |
285 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
286 |
- |
287 |
- <!-- Copy the sample project files into the root directory --> |
288 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |
289 |
|
290 |
diff --git a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch |
291 |
deleted file mode 100644 |
292 |
index c8022bcd5e4..00000000000 |
293 |
--- a/www-servers/tomcat/files/tomcat-8.5.27-build.xml.patch |
294 |
+++ /dev/null |
295 |
@@ -1,256 +0,0 @@ |
296 |
---- a/build.xml |
297 |
-+++ b/build.xml |
298 |
-@@ -717,24 +717,29 @@ |
299 |
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
300 |
- |
301 |
- <!-- Servlet 3.1 Implementation JAR File --> |
302 |
-+<!-- |
303 |
- <jarIt jarfile="${servlet-api.jar}" |
304 |
- filesDir="${tomcat.classes}" |
305 |
- filesId="files.servlet-api" |
306 |
- manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
307 |
- notice="${tomcat.manifests}/servlet-api.jar.notice" |
308 |
- license="${tomcat.manifests}/servlet-api.jar.license" /> |
309 |
-- |
310 |
-+--> |
311 |
- <!-- JSP 2.3 Implementation JAR File --> |
312 |
-+<!-- |
313 |
- <jarIt jarfile="${jsp-api.jar}" |
314 |
- filesDir="${tomcat.classes}" |
315 |
- filesId="files.jsp-api" |
316 |
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
317 |
-+--> |
318 |
- |
319 |
- <!-- EL 3.0 Implementation JAR File --> |
320 |
-+<!-- |
321 |
- <jarIt jarfile="${el-api.jar}" |
322 |
- filesDir="${tomcat.classes}" |
323 |
- filesId="files.el-api" |
324 |
- manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
325 |
-+--> |
326 |
- |
327 |
- <!-- WebSocket 1.1 API JAR File --> |
328 |
- <jarIt jarfile="${websocket-api.jar}" |
329 |
-@@ -1010,9 +1015,9 @@ |
330 |
- |
331 |
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
332 |
- description="Default. Builds a working Tomcat instance"> |
333 |
-- |
334 |
-+<!-- |
335 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
336 |
-- |
337 |
-+--> |
338 |
- <!-- Copy scripts --> |
339 |
- <copy todir="${tomcat.build}/bin"> |
340 |
- <fileset dir="bin"> |
341 |
-@@ -1072,7 +1077,7 @@ |
342 |
- <exclude name="${jdt.jar.filename}"/> |
343 |
- </fileset> |
344 |
- </delete> |
345 |
-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
346 |
-+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
347 |
- |
348 |
- <!-- Add sources for examples --> |
349 |
- <antcall target="examples-sources" /> |
350 |
-@@ -1106,7 +1111,7 @@ |
351 |
- </javac> |
352 |
- </target> |
353 |
- |
354 |
-- <target name="build-tomcat-jdbc" depends="package"> |
355 |
-+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
356 |
- <!-- build the jdbc-pool jar and source jar--> |
357 |
- <echo message="Building Tomcat JDBC pool libraries"/> |
358 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
359 |
-@@ -1121,7 +1126,7 @@ |
360 |
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
361 |
- </target> |
362 |
- |
363 |
-- <target name="build-tomcat-jdbc-src"> |
364 |
-+ <target name="build-tomcat-jdbc-src" unless="noget"> |
365 |
- <!-- build the jdbc-pool source jar--> |
366 |
- <echo message="Building Tomcat JDBC pool src JAR"/> |
367 |
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
368 |
-@@ -1225,9 +1230,11 @@ |
369 |
- |
370 |
- <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
371 |
- <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
372 |
-+<!-- |
373 |
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
374 |
- failonerror="false"/> |
375 |
- <copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
376 |
-+--> |
377 |
- <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> |
378 |
- |
379 |
- <!-- Note the meta-inf below will work as long as there is only one JAR |
380 |
-@@ -1610,7 +1617,7 @@ |
381 |
- |
382 |
- <target name="extras-webservices-prepare" |
383 |
- depends="extras-prepare" |
384 |
-- description="Prepare to build web services extras package"> |
385 |
-+ description="Prepare to build web services extras package" unless="noget"> |
386 |
- |
387 |
- <antcall target="downloadfile"> |
388 |
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
389 |
-@@ -1750,11 +1757,12 @@ |
390 |
- </copy> |
391 |
- |
392 |
- <!-- Source bundles for native components --> |
393 |
-+<!-- |
394 |
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" |
395 |
- file="${tomcat-native.tar.gz}" /> |
396 |
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" |
397 |
- file="${commons-daemon.native.src.tgz}" /> |
398 |
-- |
399 |
-+--> |
400 |
- <!-- platform README files --> |
401 |
- <echo append="false" file="${tomcat.dist}/bin/x64/README"> |
402 |
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
403 |
-@@ -1764,6 +1772,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
404 |
- |
405 |
- <target name="javadoc" depends="dist-source,extras-webservices-prepare" |
406 |
- description="Create the Tomcat javadoc" > |
407 |
-+<!-- |
408 |
- <javadoc packagenames="javax.servlet.*" |
409 |
- excludepackagenames="javax.servlet.jsp.*" |
410 |
- sourcepath="${tomcat.dist}/src/java" |
411 |
-@@ -1828,6 +1837,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
412 |
- <path location="${ant.core.lib}"/> |
413 |
- </classpath> |
414 |
- </javadoc> |
415 |
-+--> |
416 |
- <javadoc packagenames="javax.websocket.*" |
417 |
- sourcepath="${tomcat.dist}/src/java" |
418 |
- destdir="${tomcat.dist}/webapps/docs/websocketapi" |
419 |
-@@ -1868,9 +1878,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
420 |
- <path refid="tomcat.webservices.classpath"/> |
421 |
- <path location="${ant.core.lib}"/> |
422 |
- </classpath> |
423 |
-+<!-- |
424 |
- <link href="../servletapi"/> |
425 |
- <link href="../jspapi"/> |
426 |
- <link href="../elapi"/> |
427 |
-+--> |
428 |
- <link href="../websocketapi"/> |
429 |
- <link href="http://docs.oracle.com/javase/7/docs/api/"/> |
430 |
- <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> |
431 |
-@@ -2617,7 +2629,7 @@ skip.installer property in build.properties" /> |
432 |
- </target> |
433 |
- |
434 |
- <target name="download-compile" |
435 |
-- description="Download (and build) components necessary to compile" > |
436 |
-+ description="Download (and build) components necessary to compile" unless="noget"> |
437 |
- |
438 |
- <!-- Download Commons Daemon --> |
439 |
- <antcall target="downloadgz-2"> |
440 |
-@@ -2637,7 +2649,7 @@ skip.installer property in build.properties" /> |
441 |
- </target> |
442 |
- |
443 |
- <target name="download-test-compile" |
444 |
-- description="Download additional components for the tests" > |
445 |
-+ description="Download additional components for the tests" unless="noget"> |
446 |
- |
447 |
- <antcall target="downloadfile"> |
448 |
- <param name="sourcefile" value="${junit.loc}"/> |
449 |
-@@ -2694,7 +2706,7 @@ skip.installer property in build.properties" /> |
450 |
- </target> |
451 |
- |
452 |
- <target name="download-dist" |
453 |
-- description="Download additional components for a distribution" > |
454 |
-+ description="Download additional components for a distribution" unless="noget"> |
455 |
- |
456 |
- <antcall target="downloadfile-2"> |
457 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
458 |
-@@ -2734,18 +2746,18 @@ skip.installer property in build.properties" /> |
459 |
- |
460 |
- <!-- =============== Utility Targets to support downloads ================ --> |
461 |
- |
462 |
-- <target name="setproxy" if="${proxy.use}"> |
463 |
-+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
464 |
- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
465 |
- proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
466 |
- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
467 |
- </target> |
468 |
- |
469 |
-- <target name="testexist"> |
470 |
-+ <target name="testexist" unless="noget"> |
471 |
- <echo message="Testing for ${destfile}"/> |
472 |
- <available file="${destfile}" property="exist"/> |
473 |
- </target> |
474 |
- |
475 |
-- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
476 |
-+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
477 |
- <!-- Download and extract the package --> |
478 |
- <local name="temp.file"/> |
479 |
- <mkdir dir="${base.path}"/> |
480 |
-@@ -2757,7 +2769,7 @@ skip.installer property in build.properties" /> |
481 |
- <delete file="${temp.file}.tar.gz"/> |
482 |
- </target> |
483 |
- |
484 |
-- <target name="downloadgz-2" unless="exist" depends="testexist"> |
485 |
-+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
486 |
- <!-- Download and extract the package from the two alternative locations --> |
487 |
- <local name="temp.file"/> |
488 |
- <mkdir dir="${base.path}"/> |
489 |
-@@ -2776,7 +2788,7 @@ skip.installer property in build.properties" /> |
490 |
- <delete file="${temp.file}.tar.gz"/> |
491 |
- </target> |
492 |
- |
493 |
-- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
494 |
-+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
495 |
- <!-- Download and extract the package --> |
496 |
- <local name="temp.file"/> |
497 |
- <mkdir dir="${base.path}"/> |
498 |
-@@ -2787,7 +2799,7 @@ skip.installer property in build.properties" /> |
499 |
- <delete file="${temp.file}"/> |
500 |
- </target> |
501 |
- |
502 |
-- <target name="downloadzip-2" unless="exist" depends="testexist"> |
503 |
-+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
504 |
- <!-- Download and extract the package from the two alternative locations --> |
505 |
- <local name="temp.file"/> |
506 |
- <mkdir dir="${base.path}"/> |
507 |
-@@ -2805,7 +2817,7 @@ skip.installer property in build.properties" /> |
508 |
- <delete file="${temp.file}"/> |
509 |
- </target> |
510 |
- |
511 |
-- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
512 |
-+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
513 |
- <!-- Download the file --> |
514 |
- <local name="temp.file"/> |
515 |
- <mkdir dir="${base.path}"/> |
516 |
-@@ -2815,7 +2827,7 @@ skip.installer property in build.properties" /> |
517 |
- <move file="${temp.file}" tofile="${destfile}"/> |
518 |
- </target> |
519 |
- |
520 |
-- <target name="downloadfile-2" unless="exist" depends="testexist"> |
521 |
-+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
522 |
- <!-- Download the file from the two alternative locations --> |
523 |
- <local name="temp.file"/> |
524 |
- <mkdir dir="${base.path}"/> |
525 |
-@@ -2838,7 +2850,7 @@ skip.installer property in build.properties" /> |
526 |
- <move file="${temp.file}" tofile="${destfile}"/> |
527 |
- </target> |
528 |
- |
529 |
-- <target name="trydownload.check" depends="setproxy"> |
530 |
-+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
531 |
- <condition property="trydownload.run"> |
532 |
- <and> |
533 |
- <not> |
534 |
-@@ -2849,7 +2861,7 @@ skip.installer property in build.properties" /> |
535 |
- </condition> |
536 |
- </target> |
537 |
- |
538 |
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
539 |
-+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
540 |
- <!-- Downloads a file if not yet downloaded and the source URL is available --> |
541 |
- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
542 |
- </target> |
543 |
-@@ -2860,7 +2872,7 @@ skip.installer property in build.properties" /> |
544 |
- |
545 |
- <target name="ide-eclipse" |
546 |
- depends="download-compile, extras-webservices-prepare, download-test-compile" |
547 |
-- description="Prepares the source tree to be built in Eclipse"> |
548 |
-+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
549 |
- |
550 |
- <!-- Copy the sample project files into the root directory --> |
551 |
- <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |