Patch origin: in-house Patch status: Solaris-specific; not suitable for upstream Download/use only archives we really need. Don't install unnecessary stuff. --- apache-tomcat-11.0.4-src/build.xml.orig +++ apache-tomcat-11.0.4-src/build.xml @@ -1510,8 +1510,6 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> - <!-- Copy scripts --> <copy todir="${tomcat.build}/bin"> <fileset dir="bin"> @@ -2229,12 +2227,6 @@ </fileset> </copy> - <!-- Source bundles for native components --> - <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - </target> <target name="javadoc" depends="dist-source,download-compile" @@ -3351,16 +3343,6 @@ description="Download components necessary to compile" depends="setup-bnd"> - <!-- Download Commons Daemon --> - <antcall target="downloadgz-2"> - <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/> - <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/> - <param name="destfile" value="${commons-daemon.jar}"/> - <param name="checksum.enabled" value="${commons-daemon.bin.checksum.enabled}"/> - <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/> - <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/> - </antcall> - <!-- Download JDT (Eclipse compiler) --> <antcall target="downloadfile-2"> <param name="sourcefile.1" value="${jdt.loc.1}"/> @@ -3515,16 +3497,6 @@ <target name="download-dist" description="Download additional components for a distribution" > - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> - <param name="sourcefile.2" value="${tomcat-native.loc.2}"/> - <param name="destfile" value="${tomcat-native.tar.gz}"/> - <param name="destdir" value="${tomcat-native.home}"/> - <param name="checksum.enabled" value="${tomcat-native.src.checksum.enabled}"/> - <param name="checksum.algorithm" value="${tomcat-native.src.checksum.algorithm}"/> - <param name="checksum.value" value="${tomcat-native.src.checksum.value}"/> - </antcall> - <antcall target="downloadzip-2"> <param name="sourcefile.1" value="${tomcat-native.win.1}"/> <param name="sourcefile.2" value="${tomcat-native.win.2}"/> @@ -3535,16 +3507,6 @@ <param name="checksum.value" value="${tomcat-native.win.checksum.value}"/> </antcall> - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/> - <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/> - <param name="destfile" value="${commons-daemon.native.src.tgz}"/> - <param name="destdir" value="${commons-daemon.home}"/> - <param name="checksum.enabled" value="${commons-daemon.native.src.checksum.enabled}"/> - <param name="checksum.algorithm" value="${commons-daemon.native.src.checksum.algorithm}"/> - <param name="checksum.value" value="${commons-daemon.native.src.checksum.value}"/> - </antcall> - <antcall target="downloadzip-2"> <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/> <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>