equal
deleted
inserted
replaced
1 --- apache-tomcat-6.0.36-src/build.xml Tue Oct 16 01:05:51 2012 |
1 --- apache-tomcat-6.0.36-src/build.xml |
2 +++ apache-tomcat-6.0.36-src/build.xml Thu Dec 6 04:01:54 2012 |
2 +++ apache-tomcat-6.0.36-src/build.xml |
3 @@ -487,13 +487,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" |
54 - </antcall> |
54 - </antcall> |
55 - |
55 - |
56 <!-- Build Tomcat DBCP bundle --> |
56 <!-- Build Tomcat DBCP bundle --> |
57 <antcall target="downloadgz-2"> |
57 <antcall target="downloadgz-2"> |
58 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
58 <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/> |
59 @@ -836,15 +794,9 @@ |
59 @@ -823,6 +781,11 @@ |
|
60 <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/> |
|
61 <param name="destfile" value="${commons-dbcp.home}/build.xml" /> |
|
62 </antcall> |
|
63 + <!-- We need to patch DBCP so it can be built with JDK 1.7. --> |
|
64 + <exec executable="sh"> |
|
65 + <arg value="-c" /> |
|
66 + <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" /> |
|
67 + </exec> |
|
68 <mkdir dir="${tomcat-dbcp.home}"/> |
|
69 <antcall target="build-tomcat-dbcp"> |
|
70 <param name="basedir" value="${tomcat-dbcp.home}" /> |
|
71 @@ -836,15 +799,9 @@ |
60 <param name="destdir" value="${jdt.home}"/> |
72 <param name="destdir" value="${jdt.home}"/> |
61 </antcall> |
73 </antcall> |
62 |
74 |
63 - <antcall target="downloadzip"> |
75 - <antcall target="downloadzip"> |
64 - <param name="sourcefile" value="${nsis.loc}"/> |
76 - <param name="sourcefile" value="${nsis.loc}"/> |