4132N/APatch origin: in-house
4132N/APatch status: Solaris-specific; not suitable for upstream
4132N/A
4132N/ADownload/use only archives we really need.
4132N/ADon't install unnecessary stuff.
4132N/AAllow to build it with desired JDK version.
4132N/A
4132N/A--- build.xml
4132N/A+++ build.xml
5533N/A@@ -515,13 +515,6 @@
142N/A
142N/A <target name="deploy" depends="build-only,build-docs,warn.dbcp">
142N/A
142N/A- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
142N/A- file="${tomcat-native.tar.gz}" />
142N/A- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
142N/A- file="${commons-daemon.native.src.tgz}" />
142N/A-
142N/A- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
142N/A-
142N/A <!-- Copy scripts -->
142N/A <copy todir="${tomcat.build}/bin">
142N/A <fileset dir="bin">
5533N/A@@ -956,42 +949,6 @@
142N/A description="Download (and build as necessary) dependent components"
142N/A depends="build-manifests">
142N/A
5533N/A- <!-- Download Apache Tomcat Native -->
479N/A- <antcall target="downloadfile-2">
479N/A- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
479N/A- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
142N/A- <param name="destfile" value="${tomcat-native.tar.gz}"/>
142N/A- <param name="destdir" value="${tomcat-native.home}"/>
142N/A- </antcall>
142N/A-
1381N/A- <antcall target="downloadzip-2">
1381N/A- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
1381N/A- <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
1381N/A- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
142N/A- <param name="destdir" value="${tomcat-native.home}"/>
142N/A- </antcall>
142N/A-
5533N/A- <!-- Download Apache Commons Daemon -->
479N/A- <antcall target="downloadgz-2">
479N/A- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
479N/A- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
142N/A- <param name="destfile" value="${commons-daemon.jar}"/>
142N/A- </antcall>
142N/A-
479N/A- <antcall target="downloadfile-2">
479N/A- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
479N/A- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
142N/A- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
142N/A- <param name="destdir" value="${commons-daemon.home}"/>
142N/A- </antcall>
142N/A-
479N/A- <antcall target="downloadzip-2">
479N/A- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
479N/A- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
142N/A- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
142N/A- <param name="destdir" value="${commons-daemon.native.win.home}"/>
142N/A- </antcall>
142N/A-
142N/A <!-- Build Tomcat DBCP bundle -->
479N/A <antcall target="downloadgz-2">
479N/A <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
5533N/A@@ -1003,6 +960,11 @@
1668N/A <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
1668N/A <param name="destfile" value="${commons-dbcp.home}/build.xml" />
1668N/A </antcall>
1668N/A+ <!-- We need to patch DBCP so it can be built with JDK 1.7. -->
1668N/A+ <exec executable="sh">
1668N/A+ <arg value="-c" />
1668N/A+ <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
1668N/A+ </exec>
1668N/A <mkdir dir="${tomcat-dbcp.home}"/>
4132N/A <antcall target="build-tomcat-dbcp" />
4132N/A
5533N/A@@ -1014,29 +976,9 @@
479N/A <param name="destdir" value="${jdt.home}"/>
142N/A </antcall>
142N/A
5533N/A- <!-- Download NSIS (Nullsoft Scriptable Install System) -->
142N/A- <antcall target="downloadzip">
142N/A- <param name="sourcefile" value="${nsis.loc}"/>
142N/A- <param name="destfile" value="${nsis.exe}"/>
142N/A- <param name="destdir" value="${nsis.home}/.."/>
142N/A- </antcall>
142N/A-
5533N/A- <!-- Libraries used for testing. JUnit, Hamcrest -->
5533N/A- <antcall target="downloadfile">
5533N/A- <param name="sourcefile" value="${junit.loc}"/>
5533N/A- <param name="destfile" value="${junit.jar}"/>
5533N/A- <param name="destdir" value="${junit.home}"/>
5533N/A- </antcall>
5533N/A-
5533N/A- <antcall target="downloadfile">
5533N/A- <param name="sourcefile" value="${hamcrest.loc}"/>
5533N/A- <param name="destfile" value="${hamcrest.jar}"/>
5533N/A- <param name="destdir" value="${hamcrest.home}"/>
5533N/A- </antcall>
5533N/A-
142N/A </target>
142N/A
142N/A- <target name="build-tomcat-dbcp" unless="jdk16.present"
142N/A+ <target name="build-tomcat-dbcp"
142N/A depends="build-manifests">
142N/A <copy todir="${tomcat-dbcp.home}">
142N/A <fileset dir="${commons-pool.home}">