equal
deleted
inserted
replaced
4 Download/use only archives we really need. |
4 Download/use only archives we really need. |
5 Don't install unnecessary stuff. |
5 Don't install unnecessary stuff. |
6 |
6 |
7 --- build.xml |
7 --- build.xml |
8 +++ build.xml |
8 +++ build.xml |
9 @@ -999,13 +999,6 @@ |
9 @@ -988,13 +988,6 @@ |
10 <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
10 <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" |
11 description="Default. Builds a working Tomcat instance"> |
11 description="Default. Builds a working Tomcat instance"> |
12 |
12 |
13 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
13 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
14 - file="${tomcat-native.tar.gz}" /> |
14 - file="${tomcat-native.tar.gz}" /> |
18 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
18 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
19 - |
19 - |
20 <!-- Copy scripts --> |
20 <!-- Copy scripts --> |
21 <copy todir="${tomcat.build}/bin"> |
21 <copy todir="${tomcat.build}/bin"> |
22 <fileset dir="bin"> |
22 <fileset dir="bin"> |
23 @@ -2744,27 +2737,6 @@ |
23 @@ -2796,27 +2789,6 @@ |
24 <target name="download-compile" |
24 <target name="download-compile" |
25 description="Download (and build) components necessary to compile" > |
25 description="Download (and build) components necessary to compile" > |
26 |
26 |
27 - <antcall target="downloadfile-2"> |
27 - <antcall target="downloadfile-2"> |
28 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
28 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
46 - </antcall> |
46 - </antcall> |
47 - |
47 - |
48 <!-- Download JDT (Eclipse compiler) --> |
48 <!-- Download JDT (Eclipse compiler) --> |
49 <antcall target="downloadfile-2"> |
49 <antcall target="downloadfile-2"> |
50 <param name="sourcefile.1" value="${jdt.loc.1}"/> |
50 <param name="sourcefile.1" value="${jdt.loc.1}"/> |
51 @@ -2775,15 +2747,6 @@ |
|
52 |
|
53 </target> |
|
54 |
|
55 - <target name="download-npn" |
|
56 - description="Download optional NPN" > |
|
57 - <antcall target="downloadfile"> |
|
58 - <param name="sourcefile" value="${npn.loc}"/> |
|
59 - <param name="destfile" value="${npn.jar}"/> |
|
60 - <param name="destdir" value="${npn.home}"/> |
|
61 - </antcall> |
|
62 - </target> |
|
63 - |
|
64 <target name="download-test-compile" |
|
65 description="Download additional components for the tests" > |
|
66 |
|