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
4 <target name="compile" depends="compile-java6,check-java7,compile-java7" />
6 <target name="compile-java6"
7 - depends="build-prepare,download-compile,compile-prepare,validate">
8 + depends="build-prepare">
9 <!-- Compile internal server components -->
10 <javac srcdir="java" destdir="${tomcat.classes}"
11 debug="${compile.debug}"
13 <target name="deploy" depends="package,build-docs"
14 description="Default. Builds a working Tomcat instance">
16 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
17 - file="${tomcat-native.tar.gz}" />
18 - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
19 - file="${commons-daemon.native.src.tgz}" />
21 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
24 <copy todir="${tomcat.build}/bin">
30 - <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
31 + <target name="test-compile" depends="compile,compile-webapp-examples" >
32 <mkdir dir="${test.classes}"/>
34 <javac srcdir="test" destdir="${test.classes}"
39 - <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
40 + <target name="cobertura-instrument" depends="compile,cobertura-disabled"
41 if="${test.cobertura}"
42 description="Adds Cobertura instrumentation to the compiled bytecode">
44 @@ -1430,52 +1369,10 @@
45 <mkdir dir="${tomcat.extras}/webservices"/>
48 - <target name="extras-commons-logging-prepare"
49 - depends="extras-prepare"
50 - description="Prepare to build web services extras package">
52 - <antcall target="downloadfile-2">
53 - <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
54 - <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
55 - <param name="destfile" value="${commons-logging-src.tar.gz}"/>
56 - <param name="destdir" value="${commons-logging.home}"/>
59 - <antcall target="downloadfile">
60 - <param name="sourcefile" value="${avalon-framework.loc}"/>
61 - <param name="destfile" value="${avalon-framework.jar}"/>
62 - <param name="destdir" value="${avalon-framework.home}"/>
65 - <antcall target="downloadfile">
66 - <param name="sourcefile" value="${log4j.loc}"/>
67 - <param name="destfile" value="${log4j.jar}"/>
68 - <param name="destdir" value="${log4j.home}"/>
71 - <antcall target="downloadfile">
72 - <param name="sourcefile" value="${logkit.loc}"/>
73 - <param name="destfile" value="${logkit.jar}"/>
74 - <param name="destdir" value="${logkit.home}"/>
77 - <antcall target="downloadfile">
78 - <param name="sourcefile" value="${servletapi.loc}"/>
79 - <param name="destfile" value="${servletapi.jar}"/>
80 - <param name="destdir" value="${servletapi.home}"/>
85 <target name="extras-commons-logging"
86 - depends="extras-commons-logging-prepare,compile,build-manifests"
87 + depends="compile,build-manifests"
88 description="Build JULI for log4j extras package">
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/"/>
95 <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
96 encoding="ISO-8859-1">
97 <replacefilter token="org.apache.commons"
99 file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
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}" />
108 @@ -1577,18 +1475,6 @@
109 depends="extras-prepare"
110 description="Prepare to build web services extras package">
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}"/>
118 - <antcall target="downloadfile">
119 - <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
120 - <param name="destfile" value="${wsdl4j-lib.jar}"/>
121 - <param name="destdir" value="${wsdl4j-lib.home}"/>
124 <copy file="${jaxrpc-lib.jar}"
125 tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
126 <copy file="${wsdl4j-lib.jar}"
127 @@ -1694,7 +1580,7 @@
131 - <target name="dist-prepare" depends="download-dist">
132 + <target name="dist-prepare">
133 <mkdir dir="${tomcat.dist}"/>
134 <mkdir dir="${tomcat.dist}/bin"/>
135 <mkdir dir="${tomcat.dist}/conf"/>