113
|
1 |
--- apache-tomcat-6.0.33-src/build.xml Tue Aug 16 05:26:13 2011
|
|
2 |
+++ apache-tomcat-6.0.33-src/build.xml Tue Aug 16 06:44:09 2011
|
|
3 |
@@ -469,13 +469,6 @@
|
0
|
4 |
|
19
|
5 |
<target name="deploy" depends="build-only,build-docs,warn.dbcp">
|
7
|
6 |
|
0
|
7 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
|
|
8 |
- file="${tomcat-native.tar.gz}" />
|
19
|
9 |
- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
|
|
10 |
- file="${commons-daemon.native.src.tgz}" />
|
0
|
11 |
-
|
19
|
12 |
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
|
0
|
13 |
-
|
|
14 |
<!-- Copy scripts -->
|
|
15 |
<copy todir="${tomcat.build}/bin">
|
|
16 |
<fileset dir="bin">
|
113
|
17 |
@@ -759,55 +752,6 @@
|
7
|
18 |
description="Download (and build as necessary) dependent components"
|
|
19 |
depends="build-manifests">
|
0
|
20 |
|
113
|
21 |
- <antcall target="downloadfile-2">
|
|
22 |
- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
|
|
23 |
- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
|
0
|
24 |
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
|
|
25 |
- <param name="destdir" value="${tomcat-native.home}"/>
|
|
26 |
- </antcall>
|
|
27 |
-
|
113
|
28 |
- <antcall target="downloadfile-2">
|
|
29 |
- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
|
|
30 |
- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
|
|
31 |
- <param name="destfile" value="${tomcat-native.dll.win32}"/>
|
0
|
32 |
- <param name="destdir" value="${tomcat-native.home}"/>
|
|
33 |
- </antcall>
|
|
34 |
-
|
113
|
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}"/>
|
0
|
39 |
- <param name="destdir" value="${tomcat-native.home}"/>
|
|
40 |
- </antcall>
|
|
41 |
-
|
113
|
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}"/>
|
7
|
46 |
- <param name="destdir" value="${tomcat-native.home}"/>
|
|
47 |
- </antcall>
|
|
48 |
-
|
19
|
49 |
- <!-- Download Commons Daemon -->
|
113
|
50 |
- <antcall target="downloadgz-2">
|
|
51 |
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
|
|
52 |
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
|
0
|
53 |
- <param name="destfile" value="${commons-daemon.jar}"/>
|
|
54 |
- </antcall>
|
|
55 |
-
|
113
|
56 |
- <antcall target="downloadfile-2">
|
|
57 |
- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
|
|
58 |
- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
|
19
|
59 |
- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
|
|
60 |
- <param name="destdir" value="${commons-daemon.home}"/>
|
|
61 |
- </antcall>
|
|
62 |
-
|
113
|
63 |
- <antcall target="downloadzip-2">
|
|
64 |
- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
|
|
65 |
- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
|
19
|
66 |
- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
|
|
67 |
- <param name="destdir" value="${commons-daemon.native.win.home}"/>
|
|
68 |
- </antcall>
|
|
69 |
-
|
0
|
70 |
<!-- Build Tomcat DBCP bundle -->
|
113
|
71 |
<antcall target="downloadgz-2">
|
|
72 |
<param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
|
|
73 |
@@ -832,15 +776,9 @@
|
|
74 |
<param name="destdir" value="${jdt.home}"/>
|
0
|
75 |
</antcall>
|
|
76 |
|
|
77 |
- <antcall target="downloadzip">
|
|
78 |
- <param name="sourcefile" value="${nsis.loc}"/>
|
|
79 |
- <param name="destfile" value="${nsis.exe}"/>
|
|
80 |
- <param name="destdir" value="${nsis.home}/.."/>
|
|
81 |
- </antcall>
|
|
82 |
-
|
|
83 |
</target>
|
|
84 |
|
19
|
85 |
- <target name="build-tomcat-dbcp" unless="jdk16.present"
|
|
86 |
+ <target name="build-tomcat-dbcp"
|
|
87 |
depends="build-manifests">
|
7
|
88 |
<copy todir="${tomcat-dbcp.home}">
|
|
89 |
<fileset dir="${commons-pool.home}">
|