]>
Commit | Line | Data |
---|---|---|
b5209d9d ER |
1 | --- apache-tomcat-7.0.63-src/build.xml~ 2015-06-30 11:15:44.000000000 +0300 |
2 | +++ apache-tomcat-7.0.63-src/build.xml 2015-07-26 21:31:46.613106110 +0300 | |
d93791cf AM |
3 | @@ -655,7 +655,7 @@ |
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}" |
05c77d28 | 12 | @@ -1198,7 +1198,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}" | |
2ef58e72 | 21 | @@ -1371,7 +1310,7 @@ |
7aaa3c43 AM |
22 | </path> |
23 | </target> | |
24 | ||
25 | - <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled" | |
26 | + <target name="cobertura-instrument" depends="compile,cobertura-disabled" | |
27 | if="${test.cobertura}" | |
28 | description="Adds Cobertura instrumentation to the compiled bytecode"> | |
29 | ||
bdef47f6 | 30 | @@ -1556,67 +1556,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 | - | |
38 | - <antcall target="downloadfile-2"> | |
39 | - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/> | |
40 | - <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/> | |
41 | - <param name="destfile" value="${commons-logging-src.tar.gz}"/> | |
42 | - <param name="destdir" value="${commons-logging.home}"/> | |
bdef47f6 AM |
43 | - <param name="checksum.enabled" value="${commons-logging-src.checksum.enabled}"/> |
44 | - <param name="checksum.algorithm" value="${commons-logging-src.checksum.algorithm}"/> | |
45 | - <param name="checksum.value" value="${commons-logging-src.checksum.value}"/> | |
bc0d3b1f JR |
46 | - </antcall> |
47 | - | |
48 | - <antcall target="downloadfile"> | |
49 | - <param name="sourcefile" value="${avalon-framework.loc}"/> | |
50 | - <param name="destfile" value="${avalon-framework.jar}"/> | |
51 | - <param name="destdir" value="${avalon-framework.home}"/> | |
bdef47f6 AM |
52 | - <param name="checksum.enabled" value="${avalon-framework.checksum.enabled}"/> |
53 | - <param name="checksum.algorithm" value="${avalon-framework.checksum.algorithm}"/> | |
54 | - <param name="checksum.value" value="${avalon-framework.checksum.value}"/> | |
bc0d3b1f JR |
55 | - </antcall> |
56 | - | |
57 | - <antcall target="downloadfile"> | |
58 | - <param name="sourcefile" value="${log4j.loc}"/> | |
59 | - <param name="destfile" value="${log4j.jar}"/> | |
60 | - <param name="destdir" value="${log4j.home}"/> | |
bdef47f6 AM |
61 | - <param name="checksum.enabled" value="${log4j.checksum.enabled}"/> |
62 | - <param name="checksum.algorithm" value="${log4j.checksum.algorithm}"/> | |
63 | - <param name="checksum.value" value="${log4j.checksum.value}"/> | |
bc0d3b1f JR |
64 | - </antcall> |
65 | - | |
66 | - <antcall target="downloadfile"> | |
67 | - <param name="sourcefile" value="${logkit.loc}"/> | |
68 | - <param name="destfile" value="${logkit.jar}"/> | |
69 | - <param name="destdir" value="${logkit.home}"/> | |
bdef47f6 AM |
70 | - <param name="checksum.enabled" value="${logkit.checksum.enabled}"/> |
71 | - <param name="checksum.algorithm" value="${logkit.checksum.algorithm}"/> | |
72 | - <param name="checksum.value" value="${logkit.checksum.value}"/> | |
bc0d3b1f JR |
73 | - </antcall> |
74 | - | |
75 | - <antcall target="downloadfile"> | |
76 | - <param name="sourcefile" value="${servletapi.loc}"/> | |
77 | - <param name="destfile" value="${servletapi.jar}"/> | |
78 | - <param name="destdir" value="${servletapi.home}"/> | |
bdef47f6 AM |
79 | - <param name="checksum.enabled" value="${servletapi.checksum.enabled}"/> |
80 | - <param name="checksum.algorithm" value="${servletapi.checksum.algorithm}"/> | |
81 | - <param name="checksum.value" value="${servletapi.checksum.value}"/> | |
bc0d3b1f JR |
82 | - </antcall> |
83 | - | |
84 | - </target> | |
85 | - | |
86 | <target name="extras-commons-logging" | |
87 | - depends="extras-commons-logging-prepare,compile,build-manifests" | |
7aaa3c43 | 88 | + depends="compile,build-manifests" |
bc0d3b1f JR |
89 | description="Build JULI for log4j extras package"> |
90 | ||
91 | - <gunzip src="${commons-logging-src.tar.gz}" | |
92 | - dest="${tomcat.extras}/logging/commons-logging-src.tar"/> | |
93 | - <untar src="${tomcat.extras}/logging/commons-logging-src.tar" | |
94 | - dest="${tomcat.extras}/logging/"/> | |
95 | - | |
7aaa3c43 | 96 | <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons" |
bc0d3b1f JR |
97 | encoding="ISO-8859-1"> |
98 | <replacefilter token="org.apache.commons" | |
2ef58e72 | 99 | @@ -1497,7 +1394,8 @@ |
bc0d3b1f JR |
100 | file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" /> |
101 | ||
102 | <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"> | |
103 | - <fileset file="${avalon-framework.jar}" /> | |
104 | + <fileset file="${avalon-framework-api.jar}" /> | |
105 | + <fileset file="${avalon-framework-impl.jar}" /> | |
106 | <fileset file="${log4j.jar}" /> | |
107 | <fileset file="${logkit.jar}" /> | |
108 | <fileset file="${servletapi.jar}" /> | |
bdef47f6 | 109 | @@ -1660,24 +1660,6 @@ |
bc0d3b1f JR |
110 | depends="extras-prepare" |
111 | description="Prepare to build web services extras package"> | |
112 | ||
113 | - <antcall target="downloadfile"> | |
114 | - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> | |
115 | - <param name="destfile" value="${jaxrpc-lib.jar}"/> | |
116 | - <param name="destdir" value="${jaxrpc-lib.home}"/> | |
bdef47f6 AM |
117 | - <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/> |
118 | - <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/> | |
119 | - <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/> | |
bc0d3b1f JR |
120 | - </antcall> |
121 | - | |
122 | - <antcall target="downloadfile"> | |
123 | - <param name="sourcefile" value="${wsdl4j-lib.loc}"/> | |
124 | - <param name="destfile" value="${wsdl4j-lib.jar}"/> | |
125 | - <param name="destdir" value="${wsdl4j-lib.home}"/> | |
bdef47f6 AM |
126 | - <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/> |
127 | - <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/> | |
128 | - <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/> | |
bc0d3b1f JR |
129 | - </antcall> |
130 | - | |
131 | <copy file="${jaxrpc-lib.jar}" | |
132 | tofile="${tomcat.extras}/webservices/jaxrpc.jar" /> | |
133 | <copy file="${wsdl4j-lib.jar}" | |
2ef58e72 | 134 | @@ -1694,7 +1580,7 @@ |
bc0d3b1f JR |
135 | |
136 | </target> | |
137 | ||
138 | - <target name="dist-prepare" depends="download-dist"> | |
139 | + <target name="dist-prepare"> | |
140 | <mkdir dir="${tomcat.dist}"/> | |
141 | <mkdir dir="${tomcat.dist}/bin"/> | |
142 | <mkdir dir="${tomcat.dist}/conf"/> | |
c0be1349 AM |
143 | @@ -1832,13 +1832,6 @@ |
144 | </fileset> | |
145 | </copy> | |
146 | ||
147 | - <!-- Source bundles for native components --> | |
148 | - <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" | |
149 | - file="${tomcat-native.tar.gz}" /> | |
150 | - <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" | |
151 | - file="${commons-daemon.native.src.tgz}" /> | |
152 | - | |
153 | - <!-- platform README files --> | |
154 | <echo append="false" file="${tomcat.dist}/bin/x64/README"> | |
155 | Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. | |
156 | </echo> | |
157 |