1 |
fordfrog 12/11/22 01:43:40 |
2 |
|
3 |
Added: tomcat-7.0.33-build.xml.patch |
4 |
Log: |
5 |
www-servers/tomcat: version bump |
6 |
|
7 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-servers/tomcat/files/tomcat-7.0.33-build.xml.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-7.0.33-build.xml.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/tomcat-7.0.33-build.xml.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: tomcat-7.0.33-build.xml.patch |
16 |
=================================================================== |
17 |
diff --git a/build.xml b/build.xml |
18 |
index 3ff8f81..83357a4 100644 |
19 |
--- a/build.xml |
20 |
+++ b/build.xml |
21 |
@@ -613,7 +614,8 @@ |
22 |
filesId="files.annotations-api" |
23 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
24 |
|
25 |
- <!-- Servlet 3.0 Implementation JAR File --> |
26 |
+<!-- |
27 |
+ Servlet 3.0 Implementation JAR File |
28 |
<jarIt jarfile="${servlet-api.jar}" |
29 |
filesDir="${tomcat.classes}" |
30 |
filesId="files.servlet-api" |
31 |
@@ -621,7 +623,7 @@ |
32 |
notice="${tomcat.manifests}/servlet-api.jar.notice" |
33 |
license="${tomcat.manifests}/servlet-api.jar.license" /> |
34 |
|
35 |
- <!-- JSP 2.2 Implementation JAR File --> |
36 |
+ JSP 2.2 Implementation JAR File |
37 |
<jarIt jarfile="${jsp-api.jar}" |
38 |
filesDir="${tomcat.classes}" |
39 |
filesId="files.jsp-api" |
40 |
@@ -629,11 +631,12 @@ |
41 |
notice="${tomcat.manifests}/jsp-api.jar.notice" |
42 |
license="${tomcat.manifests}/jsp-api.jar.license" /> |
43 |
|
44 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
45 |
+ JSP 2.2 EL Implementation JAR File |
46 |
<jarIt jarfile="${el-api.jar}" |
47 |
filesDir="${tomcat.classes}" |
48 |
filesId="files.el-api" |
49 |
manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
50 |
+--> |
51 |
|
52 |
<!-- Bootstrap JAR File --> |
53 |
<jarIt jarfile="${bootstrap.jar}" |
54 |
@@ -834,13 +837,14 @@ |
55 |
<target name="deploy" depends="package,build-docs" |
56 |
description="Default. Builds a working Tomcat instance"> |
57 |
|
58 |
+<!-- |
59 |
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
60 |
file="${tomcat-native.tar.gz}" /> |
61 |
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
62 |
file="${commons-daemon.native.src.tgz}" /> |
63 |
|
64 |
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
65 |
- |
66 |
+--> |
67 |
<!-- Copy scripts --> |
68 |
<copy todir="${tomcat.build}/bin"> |
69 |
<fileset dir="bin"> |
70 |
@@ -918,9 +922,11 @@ |
71 |
<!-- Add sources for examples --> |
72 |
<antcall target="examples-sources" /> |
73 |
|
74 |
+<!-- |
75 |
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
76 |
failonerror="false"/> |
77 |
<copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> |
78 |
+--> |
79 |
|
80 |
<!-- build the jdbc-pool jar and source jar--> |
81 |
<echo message="Building Tomcat JDBC pool libraries"/> |
82 |
@@ -1355,7 +1361,8 @@ |
83 |
|
84 |
<target name="extras-webservices-prepare" |
85 |
depends="extras-prepare" |
86 |
- description="Prepare to build web services extras package"> |
87 |
+ description="Prepare to build web services extras package" |
88 |
+ unless="noget"> |
89 |
|
90 |
<antcall target="downloadfile"> |
91 |
<param name="sourcefile" value="${jaxrpc-lib.loc}"/> |
92 |
@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
93 |
</target> |
94 |
|
95 |
<target name="download-compile" |
96 |
- description="Download (and build) components necessary to compile" > |
97 |
+ description="Download (and build) components necessary to compile" |
98 |
+ unless="noget"> |
99 |
|
100 |
<antcall target="downloadfile-2"> |
101 |
<param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
102 |
@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
103 |
</target> |
104 |
|
105 |
<target name="download-test-compile" |
106 |
- description="Download additional components for the tests" > |
107 |
+ description="Download additional components for the tests" |
108 |
+ unless="noget"> |
109 |
|
110 |
<antcall target="downloadzip"> |
111 |
<param name="sourcefile" value="${junit.loc}"/> |
112 |
@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. |
113 |
</target> |
114 |
|
115 |
<target name="download-dist" |
116 |
- description="Download additional components for a distribution" > |
117 |
+ description="Download additional components for a distribution" |
118 |
+ unless="noget"> |
119 |
|
120 |
<antcall target="downloadzip-2"> |
121 |
<param name="sourcefile.1" value="${tomcat-native.win.1}"/> |