/[gentoo-x86]/www-servers/tomcat/files/tomcat-7.0.29-build.xml.patch
Gentoo

Contents of /www-servers/tomcat/files/tomcat-7.0.29-build.xml.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Dec 6 11:07:56 2012 UTC (5 months, 2 weeks ago) by fordfrog
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
www-servers/tomcat: removed obsolete ebuilds

(Portage version: 2.1.11.33/cvs/Linux x86_64, unsigned Manifest commit)

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

  ViewVC Help
Powered by ViewVC 1.1.13