]>
Commit | Line | Data |
---|---|---|
60f80b6f AM |
1 | --- apache-tomcat-7.0.100-src/build.xml.org 2020-02-11 09:39:54.000000000 +0100 |
2 | +++ apache-tomcat-7.0.100-src/build.xml 2020-02-29 19:19:42.236875428 +0100 | |
3 | @@ -683,7 +683,7 @@ | |
d93791cf | 4 | <target name="compile" depends="compile-java6, check-java7, compile-java7" /> |
bc0d3b1f | 5 | |
7aaa3c43 | 6 | <target name="compile-java6" |
d93791cf | 7 | - depends="build-prepare, download-compile, compile-prepare, validate"> |
7aaa3c43 | 8 | + depends="build-prepare"> |
bc0d3b1f JR |
9 | <!-- Compile internal server components --> |
10 | <javac srcdir="java" destdir="${tomcat.classes}" | |
70d2c6e8 | 11 | debug="${compile.debug}" |
60f80b6f | 12 | @@ -1409,7 +1409,7 @@ |
bc0d3b1f JR |
13 | |
14 | </target> | |
15 | ||
05c77d28 ER |
16 | - <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" > |
17 | + <target name="test-compile" depends="compile,compile-webapp-examples" > | |
bc0d3b1f JR |
18 | <mkdir dir="${test.classes}"/> |
19 | <!-- Compile --> | |
20 | <javac srcdir="test" destdir="${test.classes}" | |
60f80b6f | 21 | @@ -1621,7 +1621,7 @@ |
7aaa3c43 AM |
22 | </target> |
23 | ||
60f80b6f AM |
24 | <target name="cobertura-instrument" |
25 | - depends="compile,download-cobertura,cobertura-disabled,cobertura-disabled-log" | |
26 | + depends="compile,cobertura-disabled,cobertura-disabled-log" | |
27 | if="${cobertura.enabled}" | |
7aaa3c43 AM |
28 | description="Adds Cobertura instrumentation to the compiled bytecode"> |
29 | ||
f7072f14 | 30 | @@ -1667,66 +1667,10 @@ |
bc0d3b1f JR |
31 | <mkdir dir="${tomcat.extras}/webservices"/> |
32 | </target> | |
33 | ||
34 | - <target name="extras-commons-logging-prepare" | |
35 | - depends="extras-prepare" | |
36 | - description="Prepare to build web services extras package"> | |
37 | - | |
f7072f14 AM |
38 | - <antcall target="downloadfile"> |
39 | - <param name="sourcefile" value="${commons-logging-src.loc}"/> | |
bc0d3b1f JR |
40 | - <param name="destfile" value="${commons-logging-src.tar.gz}"/> |
41 | - <param name="destdir" value="${commons-logging.home}"/> | |
bdef47f6 AM |
42 | - <param name="checksum.enabled" value="${commons-logging-src.checksum.enabled}"/> |
43 | - <param name="checksum.algorithm" value="${commons-logging-src.checksum.algorithm}"/> | |
44 | - <param name="checksum.value" value="${commons-logging-src.checksum.value}"/> | |
bc0d3b1f JR |
45 | - </antcall> |
46 | - | |
47 | - <antcall target="downloadfile"> | |
48 | - <param name="sourcefile" value="${avalon-framework.loc}"/> | |
49 | - <param name="destfile" value="${avalon-framework.jar}"/> | |
50 | - <param name="destdir" value="${avalon-framework.home}"/> | |
bdef47f6 AM |
51 | - <param name="checksum.enabled" value="${avalon-framework.checksum.enabled}"/> |
52 | - <param name="checksum.algorithm" value="${avalon-framework.checksum.algorithm}"/> | |
53 | - <param name="checksum.value" value="${avalon-framework.checksum.value}"/> | |
bc0d3b1f JR |
54 | - </antcall> |
55 | - | |
56 | - <antcall target="downloadfile"> | |
57 | - <param name="sourcefile" value="${log4j.loc}"/> | |
58 | - <param name="destfile" value="${log4j.jar}"/> | |
59 | - <param name="destdir" value="${log4j.home}"/> | |
bdef47f6 AM |
60 | - <param name="checksum.enabled" value="${log4j.checksum.enabled}"/> |
61 | - <param name="checksum.algorithm" value="${log4j.checksum.algorithm}"/> | |
62 | - <param name="checksum.value" value="${log4j.checksum.value}"/> | |
bc0d3b1f JR |
63 | - </antcall> |
64 | - | |
65 | - <antcall target="downloadfile"> | |
66 | - <param name="sourcefile" value="${logkit.loc}"/> | |
67 | - <param name="destfile" value="${logkit.jar}"/> | |
68 | - <param name="destdir" value="${logkit.home}"/> | |
bdef47f6 AM |
69 | - <param name="checksum.enabled" value="${logkit.checksum.enabled}"/> |
70 | - <param name="checksum.algorithm" value="${logkit.checksum.algorithm}"/> | |
71 | - <param name="checksum.value" value="${logkit.checksum.value}"/> | |
bc0d3b1f JR |
72 | - </antcall> |
73 | - | |
74 | - <antcall target="downloadfile"> | |
75 | - <param name="sourcefile" value="${servletapi.loc}"/> | |
76 | - <param name="destfile" value="${servletapi.jar}"/> | |
77 | - <param name="destdir" value="${servletapi.home}"/> | |
bdef47f6 AM |
78 | - <param name="checksum.enabled" value="${servletapi.checksum.enabled}"/> |
79 | - <param name="checksum.algorithm" value="${servletapi.checksum.algorithm}"/> | |
80 | - <param name="checksum.value" value="${servletapi.checksum.value}"/> | |
bc0d3b1f JR |
81 | - </antcall> |
82 | - | |
83 | - </target> | |
84 | - | |
85 | <target name="extras-commons-logging" | |
86 | - depends="extras-commons-logging-prepare,compile,build-manifests" | |
7aaa3c43 | 87 | + depends="compile,build-manifests" |
bc0d3b1f JR |
88 | description="Build JULI for log4j extras package"> |
89 | ||
90 | - <gunzip src="${commons-logging-src.tar.gz}" | |
91 | - dest="${tomcat.extras}/logging/commons-logging-src.tar"/> | |
92 | - <untar src="${tomcat.extras}/logging/commons-logging-src.tar" | |
93 | - dest="${tomcat.extras}/logging/"/> | |
94 | - | |
7aaa3c43 | 95 | <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons" |
bc0d3b1f JR |
96 | encoding="ISO-8859-1"> |
97 | <replacefilter token="org.apache.commons" | |
60f80b6f | 98 | @@ -1763,7 +1706,8 @@ |
bc0d3b1f JR |
99 | file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" /> |
100 | ||
101 | <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"> | |
102 | - <fileset file="${avalon-framework.jar}" /> | |
103 | + <fileset file="${avalon-framework-api.jar}" /> | |
104 | + <fileset file="${avalon-framework-impl.jar}" /> | |
105 | <fileset file="${log4j.jar}" /> | |
106 | <fileset file="${logkit.jar}" /> | |
107 | <fileset file="${servletapi.jar}" /> | |
60f80b6f | 108 | @@ -1842,24 +1786,6 @@ |
bc0d3b1f JR |
109 | depends="extras-prepare" |
110 | description="Prepare to build web services extras package"> | |
111 | ||
112 | - <antcall target="downloadfile"> | |
113 | - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> | |
114 | - <param name="destfile" value="${jaxrpc-lib.jar}"/> | |
115 | - <param name="destdir" value="${jaxrpc-lib.home}"/> | |
bdef47f6 AM |
116 | - <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/> |
117 | - <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/> | |
118 | - <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/> | |
bc0d3b1f JR |
119 | - </antcall> |
120 | - | |
121 | - <antcall target="downloadfile"> | |
122 | - <param name="sourcefile" value="${wsdl4j-lib.loc}"/> | |
123 | - <param name="destfile" value="${wsdl4j-lib.jar}"/> | |
124 | - <param name="destdir" value="${wsdl4j-lib.home}"/> | |
bdef47f6 AM |
125 | - <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/> |
126 | - <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/> | |
127 | - <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/> | |
bc0d3b1f JR |
128 | - </antcall> |
129 | - | |
130 | <copy file="${jaxrpc-lib.jar}" | |
131 | tofile="${tomcat.extras}/webservices/jaxrpc.jar" /> | |
132 | <copy file="${wsdl4j-lib.jar}" | |
60f80b6f | 133 | @@ -1961,7 +1887,7 @@ |
bc0d3b1f JR |
134 | |
135 | </target> | |
136 | ||
137 | - <target name="dist-prepare" depends="download-dist"> | |
138 | + <target name="dist-prepare"> | |
139 | <mkdir dir="${tomcat.dist}"/> | |
140 | <mkdir dir="${tomcat.dist}/bin"/> | |
141 | <mkdir dir="${tomcat.dist}/conf"/> | |
60f80b6f | 142 | @@ -2034,13 +1960,6 @@ |
c0be1349 AM |
143 | </fileset> |
144 | </copy> | |
145 | ||
146 | - <!-- Source bundles for native components --> | |
147 | - <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" | |
148 | - file="${tomcat-native.tar.gz}" /> | |
149 | - <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" | |
150 | - file="${commons-daemon.native.src.tgz}" /> | |
151 | - | |
152 | - <!-- platform README files --> | |
153 | <echo append="false" file="${tomcat.dist}/bin/x64/README"> | |
154 | Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. | |
155 | </echo> | |
60f80b6f AM |
156 | @@ -2791,7 +2791,7 @@ skip.installer property in build.propert |
157 | ||
158 | <target name="download-deps" | |
159 | description="Download the dependencies required to build and test" | |
160 | - depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-commons-logging-prepare, extras-webservices-prepare" /> | |
161 | + depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-webservices-prepare" /> | |
162 | ||
163 | <target name="download-validate" | |
164 | description="Download components necessary to validate source" |