1 Patch origin: in-house |
|
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 |
|
4 Download/use only archives we really need. |
|
5 Don't install unnecessary stuff. |
|
6 Allow to build it with desired JDK version. |
|
7 |
|
8 --- build.xml |
|
9 +++ build.xml |
|
10 @@ -492,13 +492,6 @@ |
|
11 |
|
12 <target name="deploy" depends="build-only,build-docs,warn.dbcp"> |
|
13 |
|
14 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
|
15 - file="${tomcat-native.tar.gz}" /> |
|
16 - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
|
17 - file="${commons-daemon.native.src.tgz}" /> |
|
18 - |
|
19 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
|
20 - |
|
21 <!-- Copy scripts --> |
|
22 <copy todir="${tomcat.build}/bin"> |
|
23 <fileset dir="bin"> |
|
24 @@ -780,41 +773,6 @@ |
|
25 description="Download (and build as necessary) dependent components" |
|
26 depends="build-manifests"> |
|
27 |
|
28 - <antcall target="downloadfile-2"> |
|
29 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
|
30 - <param name="sourcefile.2" value="${tomcat-native.loc.2}"/> |
|
31 - <param name="destfile" value="${tomcat-native.tar.gz}"/> |
|
32 - <param name="destdir" value="${tomcat-native.home}"/> |
|
33 - </antcall> |
|
34 - |
|
35 - <antcall target="downloadzip-2"> |
|
36 - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |
|
37 - <param name="sourcefile.2" value="${tomcat-native.win.2}"/> |
|
38 - <param name="destfile" value="${tomcat-native.home}/LICENSE"/> |
|
39 - <param name="destdir" value="${tomcat-native.home}"/> |
|
40 - </antcall> |
|
41 - |
|
42 - <!-- Download Commons Daemon --> |
|
43 - <antcall target="downloadgz-2"> |
|
44 - <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/> |
|
45 - <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/> |
|
46 - <param name="destfile" value="${commons-daemon.jar}"/> |
|
47 - </antcall> |
|
48 - |
|
49 - <antcall target="downloadfile-2"> |
|
50 - <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/> |
|
51 - <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/> |
|
52 - <param name="destfile" value="${commons-daemon.native.src.tgz}"/> |
|
53 - <param name="destdir" value="${commons-daemon.home}"/> |
|
54 - </antcall> |
|
55 - |
|
56 - <antcall target="downloadzip-2"> |
|
57 - <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/> |
|
58 - <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/> |
|
59 - <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/> |
|
60 - <param name="destdir" value="${commons-daemon.native.win.home}"/> |
|
61 - </antcall> |
|
62 - |
|
63 <!-- Build Tomcat DBCP bundle --> |
|
64 <antcall target="downloadgz-2"> |
|
65 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
|
66 @@ -826,6 +784,11 @@ |
|
67 <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/> |
|
68 <param name="destfile" value="${commons-dbcp.home}/build.xml" /> |
|
69 </antcall> |
|
70 + <!-- We need to patch DBCP so it can be built with JDK 1.7. --> |
|
71 + <exec executable="sh"> |
|
72 + <arg value="-c" /> |
|
73 + <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" /> |
|
74 + </exec> |
|
75 <mkdir dir="${tomcat-dbcp.home}"/> |
|
76 <antcall target="build-tomcat-dbcp" /> |
|
77 |
|
78 @@ -837,15 +800,9 @@ |
|
79 <param name="destdir" value="${jdt.home}"/> |
|
80 </antcall> |
|
81 |
|
82 - <antcall target="downloadzip"> |
|
83 - <param name="sourcefile" value="${nsis.loc}"/> |
|
84 - <param name="destfile" value="${nsis.exe}"/> |
|
85 - <param name="destdir" value="${nsis.home}/.."/> |
|
86 - </antcall> |
|
87 - |
|
88 </target> |
|
89 |
|
90 - <target name="build-tomcat-dbcp" unless="jdk16.present" |
|
91 + <target name="build-tomcat-dbcp" |
|
92 depends="build-manifests"> |
|
93 <copy todir="${tomcat-dbcp.home}"> |
|
94 <fileset dir="${commons-pool.home}"> |
|