1 --- apache-tomcat-6.0.36-src/build.xml |
1 Patch origin: in-house |
2 +++ apache-tomcat-6.0.36-src/build.xml |
2 Patch status: Solaris-specific; not suitable for upstream |
3 @@ -487,13 +487,6 @@ |
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 @@ |
4 |
11 |
5 <target name="deploy" depends="build-only,build-docs,warn.dbcp"> |
12 <target name="deploy" depends="build-only,build-docs,warn.dbcp"> |
6 |
13 |
7 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
14 - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
8 - file="${tomcat-native.tar.gz}" /> |
15 - file="${tomcat-native.tar.gz}" /> |
12 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
19 - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
13 - |
20 - |
14 <!-- Copy scripts --> |
21 <!-- Copy scripts --> |
15 <copy todir="${tomcat.build}/bin"> |
22 <copy todir="${tomcat.build}/bin"> |
16 <fileset dir="bin"> |
23 <fileset dir="bin"> |
17 @@ -777,41 +770,6 @@ |
24 @@ -780,41 +773,6 @@ |
18 description="Download (and build as necessary) dependent components" |
25 description="Download (and build as necessary) dependent components" |
19 depends="build-manifests"> |
26 depends="build-manifests"> |
20 |
27 |
21 - <antcall target="downloadfile-2"> |
28 - <antcall target="downloadfile-2"> |
22 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
29 - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> |
54 - </antcall> |
61 - </antcall> |
55 - |
62 - |
56 <!-- Build Tomcat DBCP bundle --> |
63 <!-- Build Tomcat DBCP bundle --> |
57 <antcall target="downloadgz-2"> |
64 <antcall target="downloadgz-2"> |
58 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
65 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
59 @@ -823,6 +781,11 @@ |
66 @@ -826,6 +784,11 @@ |
60 <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/> |
67 <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/> |
61 <param name="destfile" value="${commons-dbcp.home}/build.xml" /> |
68 <param name="destfile" value="${commons-dbcp.home}/build.xml" /> |
62 </antcall> |
69 </antcall> |
63 + <!-- We need to patch DBCP so it can be built with JDK 1.7. --> |
70 + <!-- We need to patch DBCP so it can be built with JDK 1.7. --> |
64 + <exec executable="sh"> |
71 + <exec executable="sh"> |
65 + <arg value="-c" /> |
72 + <arg value="-c" /> |
66 + <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" /> |
73 + <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" /> |
67 + </exec> |
74 + </exec> |
68 <mkdir dir="${tomcat-dbcp.home}"/> |
75 <mkdir dir="${tomcat-dbcp.home}"/> |
69 <antcall target="build-tomcat-dbcp"> |
76 <antcall target="build-tomcat-dbcp" /> |
70 <param name="basedir" value="${tomcat-dbcp.home}" /> |
77 |
71 @@ -836,15 +799,9 @@ |
78 @@ -837,15 +800,9 @@ |
72 <param name="destdir" value="${jdt.home}"/> |
79 <param name="destdir" value="${jdt.home}"/> |
73 </antcall> |
80 </antcall> |
74 |
81 |
75 - <antcall target="downloadzip"> |
82 - <antcall target="downloadzip"> |
76 - <param name="sourcefile" value="${nsis.loc}"/> |
83 - <param name="sourcefile" value="${nsis.loc}"/> |