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 @@ -696,48 +689,6 @@ |
17 @@ -759,55 +752,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"> |
21 - <antcall target="downloadfile-2"> |
22 - <param name="sourcefile" value="${tomcat-native.loc}"/> |
22 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
|
23 - <param name="sourcefile.2" value="${tomcat-native.loc.2}"/> |
23 - <param name="destfile" value="${tomcat-native.tar.gz}"/> |
24 - <param name="destfile" value="${tomcat-native.tar.gz}"/> |
24 - <param name="destdir" value="${tomcat-native.home}"/> |
25 - <param name="destdir" value="${tomcat-native.home}"/> |
25 - </antcall> |
26 - </antcall> |
26 - |
27 - |
27 - <antcall target="downloadfile"> |
28 - <antcall target="downloadfile-2"> |
28 - <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/> |
29 - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/> |
29 - <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/> |
30 - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/> |
|
31 - <param name="destfile" value="${tomcat-native.dll.win32}"/> |
30 - <param name="destdir" value="${tomcat-native.home}"/> |
32 - <param name="destdir" value="${tomcat-native.home}"/> |
31 - </antcall> |
33 - </antcall> |
32 - |
34 - |
33 - <antcall target="downloadfile"> |
35 - <antcall target="downloadfile-2"> |
34 - <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/> |
36 - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/> |
35 - <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/> |
37 - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/> |
|
38 - <param name="destfile" value="${tomcat-native.dll.x64}"/> |
36 - <param name="destdir" value="${tomcat-native.home}"/> |
39 - <param name="destdir" value="${tomcat-native.home}"/> |
37 - </antcall> |
40 - </antcall> |
38 - |
41 - |
39 - <antcall target="downloadfile"> |
42 - <antcall target="downloadfile-2"> |
40 - <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/> |
43 - <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/> |
41 - <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/> |
44 - <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/> |
|
45 - <param name="destfile" value="${tomcat-native.dll.i64}"/> |
42 - <param name="destdir" value="${tomcat-native.home}"/> |
46 - <param name="destdir" value="${tomcat-native.home}"/> |
43 - </antcall> |
47 - </antcall> |
44 - |
48 - |
45 - <!-- Download Commons Daemon --> |
49 - <!-- Download Commons Daemon --> |
46 - <antcall target="downloadgz"> |
50 - <antcall target="downloadgz-2"> |
47 - <param name="sourcefile" value="${commons-daemon.bin.loc}"/> |
51 - <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/> |
|
52 - <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/> |
48 - <param name="destfile" value="${commons-daemon.jar}"/> |
53 - <param name="destfile" value="${commons-daemon.jar}"/> |
49 - </antcall> |
54 - </antcall> |
50 - |
55 - |
51 - <antcall target="downloadfile"> |
56 - <antcall target="downloadfile-2"> |
52 - <param name="sourcefile" value="${commons-daemon.native.src.loc}"/> |
57 - <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/> |
|
58 - <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/> |
53 - <param name="destfile" value="${commons-daemon.native.src.tgz}"/> |
59 - <param name="destfile" value="${commons-daemon.native.src.tgz}"/> |
54 - <param name="destdir" value="${commons-daemon.home}"/> |
60 - <param name="destdir" value="${commons-daemon.home}"/> |
55 - </antcall> |
61 - </antcall> |
56 - |
62 - |
57 - <antcall target="downloadzip"> |
63 - <antcall target="downloadzip-2"> |
58 - <param name="sourcefile" value="${commons-daemon.native.win.loc}"/> |
64 - <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/> |
|
65 - <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/> |
59 - <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/> |
66 - <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/> |
60 - <param name="destdir" value="${commons-daemon.native.win.home}"/> |
67 - <param name="destdir" value="${commons-daemon.native.win.home}"/> |
61 - </antcall> |
68 - </antcall> |
62 - |
69 - |
63 <!-- Build Tomcat DBCP bundle --> |
70 <!-- Build Tomcat DBCP bundle --> |
64 <antcall target="downloadgz"> |
71 <antcall target="downloadgz-2"> |
65 <param name="sourcefile" value="${commons-pool-src.loc}"/> |
72 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
66 @@ -763,15 +714,9 @@ |
73 @@ -832,15 +776,9 @@ |
67 <param name="basedir" value="${jasper-jdt.home}" /> |
74 <param name="destdir" value="${jdt.home}"/> |
68 </antcall> |
75 </antcall> |
69 |
76 |
70 - <antcall target="downloadzip"> |
77 - <antcall target="downloadzip"> |
71 - <param name="sourcefile" value="${nsis.loc}"/> |
78 - <param name="sourcefile" value="${nsis.loc}"/> |
72 - <param name="destfile" value="${nsis.exe}"/> |
79 - <param name="destfile" value="${nsis.exe}"/> |