1 |
fordfrog 15/02/24 21:06:23 |
2 |
|
3 |
Added: tomcat-8.0.20-build.xml.patch |
4 |
Log: |
5 |
www-servers/tomcat: version bump |
6 |
|
7 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-servers/tomcat/files/tomcat-8.0.20-build.xml.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-8.0.20-build.xml.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-8.0.20-build.xml.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: tomcat-8.0.20-build.xml.patch |
16 |
=================================================================== |
17 |
diff -Naur apache-tomcat-8.0.18-src-orig/build.xml apache-tomcat-8.0.18-src/build.xml |
18 |
--- apache-tomcat-8.0.18-src-orig/build.xml 2015-01-28 15:10:36.112146352 -0500 |
19 |
+++ apache-tomcat-8.0.18-src/build.xml 2015-02-19 18:08:37.971396016 -0500 |
20 |
@@ -703,24 +703,29 @@ |
21 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
22 |
|
23 |
<!-- Servlet 3.1 Implementation JAR File --> |
24 |
+<!-- |
25 |
<jarIt jarfile="${servlet-api.jar}" |
26 |
filesDir="${tomcat.classes}" |
27 |
filesId="files.servlet-api" |
28 |
manifest="${tomcat.manifests}/servlet-api.jar.manifest" |
29 |
notice="${tomcat.manifests}/servlet-api.jar.notice" |
30 |
license="${tomcat.manifests}/servlet-api.jar.license" /> |
31 |
- |
32 |
+--> |
33 |
<!-- JSP 2.3 Implementation JAR File --> |
34 |
+<!-- |
35 |
<jarIt jarfile="${jsp-api.jar}" |
36 |
filesDir="${tomcat.classes}" |
37 |
filesId="files.jsp-api" |
38 |
manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> |
39 |
+--> |
40 |
|
41 |
<!-- EL 3.0 Implementation JAR File --> |
42 |
+<!-- |
43 |
<jarIt jarfile="${el-api.jar}" |
44 |
filesDir="${tomcat.classes}" |
45 |
filesId="files.el-api" |
46 |
manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
47 |
+--> |
48 |
|
49 |
<!-- WebSocket 1.1 API JAR File --> |
50 |
<jarIt jarfile="${websocket-api.jar}" |
51 |
@@ -992,14 +997,14 @@ |
52 |
|
53 |
<target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
54 |
description="Default. Builds a working Tomcat instance"> |
55 |
- |
56 |
+<!-- |
57 |
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
58 |
file="${tomcat-native.tar.gz}" /> |
59 |
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
60 |
file="${commons-daemon.native.src.tgz}" /> |
61 |
|
62 |
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
63 |
- |
64 |
+--> |
65 |
<!-- Copy scripts --> |
66 |
<copy todir="${tomcat.build}/bin"> |
67 |
<fileset dir="bin"> |
68 |
@@ -1059,7 +1064,7 @@ |
69 |
<exclude name="${jdt.jar.filename}"/> |
70 |
</fileset> |
71 |
</delete> |
72 |
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> |
73 |
+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> |
74 |
|
75 |
<!-- Add sources for examples --> |
76 |
<antcall target="examples-sources" /> |
77 |
@@ -1093,7 +1098,7 @@ |
78 |
</javac> |
79 |
</target> |
80 |
|
81 |
- <target name="build-tomcat-jdbc" depends="package"> |
82 |
+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> |
83 |
<!-- build the jdbc-pool jar and source jar--> |
84 |
<echo message="Building Tomcat JDBC pool libraries"/> |
85 |
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
86 |
@@ -1108,7 +1113,7 @@ |
87 |
<copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> |
88 |
</target> |
89 |
|
90 |
- <target name="build-tomcat-jdbc-src"> |
91 |
+ <target name="build-tomcat-jdbc-src" unless="noget"> |
92 |
<!-- build the jdbc-pool source jar--> |
93 |
<echo message="Building Tomcat JDBC pool src JAR"/> |
94 |
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" |
95 |
@@ -1212,10 +1217,11 @@ |
96 |
|
97 |
<copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> |
98 |
<copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> |
99 |
+<!-- |
100 |
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" |
101 |
failonerror="false"/> |
102 |
<copy file="${jdt.jar}" todir="${tomcat.embed}" /> |
103 |
- |
104 |
+--> |
105 |
<!-- Note the meta-inf below will work as long as there is only one JAR |
106 |
that needs to add entries. If there is more than one a more complex |
107 |
solution will be required. --> |
108 |
@@ -1519,7 +1525,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 |
@@ -1658,7 +1664,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 |
@@ -2703,7 +2709,7 @@ |
127 |
</target> |
128 |
|
129 |
<target name="download-compile" |
130 |
- description="Download (and build) components necessary to compile" > |
131 |
+ description="Download (and build) components necessary to compile" unless="noget"> |
132 |
|
133 |
<antcall target="downloadfile-2"> |
134 |
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
135 |
@@ -2746,7 +2752,7 @@ |
136 |
</target> |
137 |
|
138 |
<target name="download-test-compile" |
139 |
- description="Download additional components for the tests" > |
140 |
+ description="Download additional components for the tests" unless="noget"> |
141 |
|
142 |
<antcall target="downloadfile"> |
143 |
<param name="sourcefile" value="${junit.loc}"/> |
144 |
@@ -2792,7 +2798,7 @@ |
145 |
</target> |
146 |
|
147 |
<target name="download-dist" |
148 |
- description="Download additional components for a distribution" > |
149 |
+ description="Download additional components for a distribution" unless="noget"> |
150 |
|
151 |
<antcall target="downloadzip-2"> |
152 |
<param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
153 |
@@ -2818,18 +2824,18 @@ |
154 |
|
155 |
<!-- =============== Utility Targets to support downloads ================ --> |
156 |
|
157 |
- <target name="setproxy" if="${proxy.use}"> |
158 |
+ <target name="setproxy" if="${proxy.use}" unless="noget"> |
159 |
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" |
160 |
proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> |
161 |
<echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> |
162 |
</target> |
163 |
|
164 |
- <target name="testexist"> |
165 |
+ <target name="testexist" unless="noget"> |
166 |
<echo message="Testing for ${destfile}"/> |
167 |
<available file="${destfile}" property="exist"/> |
168 |
</target> |
169 |
|
170 |
- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> |
171 |
+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> |
172 |
<!-- Download and extract the package --> |
173 |
<local name="temp.file"/> |
174 |
<mkdir dir="${base.path}"/> |
175 |
@@ -2841,7 +2847,7 @@ |
176 |
<delete file="${temp.file}.tar.gz"/> |
177 |
</target> |
178 |
|
179 |
- <target name="downloadgz-2" unless="exist" depends="testexist"> |
180 |
+ <target name="downloadgz-2" unless="noget" depends="testexist"> |
181 |
<!-- Download and extract the package from the two alternative locations --> |
182 |
<local name="temp.file"/> |
183 |
<mkdir dir="${base.path}"/> |
184 |
@@ -2860,7 +2866,7 @@ |
185 |
<delete file="${temp.file}.tar.gz"/> |
186 |
</target> |
187 |
|
188 |
- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> |
189 |
+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> |
190 |
<!-- Download and extract the package --> |
191 |
<local name="temp.file"/> |
192 |
<mkdir dir="${base.path}"/> |
193 |
@@ -2871,7 +2877,7 @@ |
194 |
<delete file="${temp.file}"/> |
195 |
</target> |
196 |
|
197 |
- <target name="downloadzip-2" unless="exist" depends="testexist"> |
198 |
+ <target name="downloadzip-2" unless="noget" depends="testexist"> |
199 |
<!-- Download and extract the package from the two alternative locations --> |
200 |
<local name="temp.file"/> |
201 |
<mkdir dir="${base.path}"/> |
202 |
@@ -2889,7 +2895,7 @@ |
203 |
<delete file="${temp.file}"/> |
204 |
</target> |
205 |
|
206 |
- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> |
207 |
+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> |
208 |
<!-- Download the file --> |
209 |
<local name="temp.file"/> |
210 |
<mkdir dir="${base.path}"/> |
211 |
@@ -2899,7 +2905,7 @@ |
212 |
<move file="${temp.file}" tofile="${destfile}"/> |
213 |
</target> |
214 |
|
215 |
- <target name="downloadfile-2" unless="exist" depends="testexist"> |
216 |
+ <target name="downloadfile-2" unless="noget" depends="testexist"> |
217 |
<!-- Download the file from the two alternative locations --> |
218 |
<local name="temp.file"/> |
219 |
<mkdir dir="${base.path}"/> |
220 |
@@ -2922,7 +2928,7 @@ |
221 |
<move file="${temp.file}" tofile="${destfile}"/> |
222 |
</target> |
223 |
|
224 |
- <target name="trydownload.check" depends="setproxy"> |
225 |
+ <target name="trydownload.check" depends="setproxy" unless="noget"> |
226 |
<condition property="trydownload.run"> |
227 |
<and> |
228 |
<not> |
229 |
@@ -2933,7 +2939,7 @@ |
230 |
</condition> |
231 |
</target> |
232 |
|
233 |
- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> |
234 |
+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> |
235 |
<!-- Downloads a file if not yet downloaded and the source URL is available --> |
236 |
<get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> |
237 |
</target> |
238 |
@@ -2944,7 +2950,7 @@ |
239 |
|
240 |
<target name="ide-eclipse" |
241 |
depends="download-compile, extras-webservices-prepare, download-test-compile" |
242 |
- description="Prepares the source tree to be built in Eclipse"> |
243 |
+ description="Prepares the source tree to be built in Eclipse" unless="noget"> |
244 |
|
245 |
<!-- Copy the sample project files into the root directory --> |
246 |
<copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> |