1 --- apache-tomcat-6.0.33-src/build.xml Tue Aug 16 05:26:13 2011 |
1 --- apache-tomcat-6.0.36-src/build.xml Tue Oct 16 01:05:51 2012 |
2 +++ apache-tomcat-6.0.33-src/build.xml Tue Aug 16 06:44:09 2011 |
2 +++ apache-tomcat-6.0.36-src/build.xml Thu Dec 6 04:01:54 2012 |
3 @@ -469,13 +469,6 @@ |
3 @@ -487,13 +487,6 @@ |
4 |
4 |
5 <target name="deploy" depends="build-only,build-docs,warn.dbcp"> |
5 <target name="deploy" depends="build-only,build-docs,warn.dbcp"> |
6 |
6 |
7 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
7 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
8 - file="${tomcat-native.tar.gz}" /> |
8 - file="${tomcat-native.tar.gz}" /> |
12 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
12 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
13 - |
13 - |
14 <!-- Copy scripts --> |
14 <!-- Copy scripts --> |
15 <copy todir="${tomcat.build}/bin"> |
15 <copy todir="${tomcat.build}/bin"> |
16 <fileset dir="bin"> |
16 <fileset dir="bin"> |
17 @@ -759,55 +752,6 @@ |
17 @@ -777,41 +770,6 @@ |
18 description="Download (and build as necessary) dependent components" |
18 description="Download (and build as necessary) dependent components" |
19 depends="build-manifests"> |
19 depends="build-manifests"> |
20 |
20 |
21 - <antcall target="downloadfile-2"> |
21 - <antcall target="downloadfile-2"> |
22 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
22 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
23 - <param name="sourcefile.2" value="${tomcat-native.loc.2}"/> |
23 - <param name="sourcefile.2" value="${tomcat-native.loc.2}"/> |
24 - <param name="destfile" value="${tomcat-native.tar.gz}"/> |
24 - <param name="destfile" value="${tomcat-native.tar.gz}"/> |
25 - <param name="destdir" value="${tomcat-native.home}"/> |
25 - <param name="destdir" value="${tomcat-native.home}"/> |
26 - </antcall> |
26 - </antcall> |
27 - |
27 - |
28 - <antcall target="downloadfile-2"> |
28 - <antcall target="downloadzip-2"> |
29 - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/> |
29 - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
30 - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/> |
30 - <param name="sourcefile.2" value="${tomcat-native.win.2}"/> |
31 - <param name="destfile" value="${tomcat-native.dll.win32}"/> |
31 - <param name="destfile" value="${tomcat-native.home}/LICENSE"/> |
32 - <param name="destdir" value="${tomcat-native.home}"/> |
|
33 - </antcall> |
|
34 - |
|
35 - <antcall target="downloadfile-2"> |
|
36 - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/> |
|
37 - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/> |
|
38 - <param name="destfile" value="${tomcat-native.dll.x64}"/> |
|
39 - <param name="destdir" value="${tomcat-native.home}"/> |
|
40 - </antcall> |
|
41 - |
|
42 - <antcall target="downloadfile-2"> |
|
43 - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/> |
|
44 - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/> |
|
45 - <param name="destfile" value="${tomcat-native.dll.i64}"/> |
|
46 - <param name="destdir" value="${tomcat-native.home}"/> |
32 - <param name="destdir" value="${tomcat-native.home}"/> |
47 - </antcall> |
33 - </antcall> |
48 - |
34 - |
49 - <!-- Download Commons Daemon --> |
35 - <!-- Download Commons Daemon --> |
50 - <antcall target="downloadgz-2"> |
36 - <antcall target="downloadgz-2"> |
68 - </antcall> |
54 - </antcall> |
69 - |
55 - |
70 <!-- Build Tomcat DBCP bundle --> |
56 <!-- Build Tomcat DBCP bundle --> |
71 <antcall target="downloadgz-2"> |
57 <antcall target="downloadgz-2"> |
72 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
58 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
73 @@ -832,15 +776,9 @@ |
59 @@ -836,15 +794,9 @@ |
74 <param name="destdir" value="${jdt.home}"/> |
60 <param name="destdir" value="${jdt.home}"/> |
75 </antcall> |
61 </antcall> |
76 |
62 |
77 - <antcall target="downloadzip"> |
63 - <antcall target="downloadzip"> |
78 - <param name="sourcefile" value="${nsis.loc}"/> |
64 - <param name="sourcefile" value="${nsis.loc}"/> |