0N/A--- apache-tomcat-6.0.36-src/build.xml Tue Oct 16 01:05:51 2012

2362N/A+++ apache-tomcat-6.0.36-src/build.xml Thu Dec 6 04:01:54 2012

0N/A@@ -487,13 +487,6 @@

0N/A

0N/A <target name="deploy" depends="build-only,build-docs,warn.dbcp">

0N/A

2362N/A- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"

0N/A- file="${tomcat-native.tar.gz}" />

2362N/A- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"

0N/A- file="${commons-daemon.native.src.tgz}" />

0N/A-

0N/A- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />

0N/A-

0N/A <!-- Copy scripts -->

0N/A <copy todir="${tomcat.build}/bin">

0N/A <fileset dir="bin">

0N/A@@ -777,41 +770,6 @@

0N/A description="Download (and build as necessary) dependent components"

0N/A depends="build-manifests">

0N/A

2362N/A- <antcall target="downloadfile-2">

2362N/A- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>

2362N/A- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>

0N/A- <param name="destfile" value="${tomcat-native.tar.gz}"/>

0N/A- <param name="destdir" value="${tomcat-native.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadzip-2">

0N/A- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>

0N/A- <param name="sourcefile.2" value="${tomcat-native.win.2}"/>

0N/A- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>

0N/A- <param name="destdir" value="${tomcat-native.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <!-- Download Commons Daemon -->

0N/A- <antcall target="downloadgz-2">

0N/A- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>

0N/A- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>

0N/A- <param name="destfile" value="${commons-daemon.jar}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadfile-2">

0N/A- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>

0N/A- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>

0N/A- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>

0N/A- <param name="destdir" value="${commons-daemon.home}"/>

0N/A- </antcall>

0N/A-

0N/A- <antcall target="downloadzip-2">

0N/A- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>

0N/A- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>

0N/A- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>

0N/A- <param name="destdir" value="${commons-daemon.native.win.home}"/>

0N/A- </antcall>

0N/A-

0N/A <!-- Build Tomcat DBCP bundle -->

0N/A <antcall target="downloadgz-2">

0N/A <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>

0N/A@@ -836,15 +794,9 @@

0N/A <param name="destdir" value="${jdt.home}"/>

0N/A </antcall>

0N/A

0N/A- <antcall target="downloadzip">

0N/A- <param name="sourcefile" value="${nsis.loc}"/>

0N/A- <param name="destfile" value="${nsis.exe}"/>

0N/A- <param name="destdir" value="${nsis.home}/.."/>

0N/A- </antcall>

0N/A-

0N/A </target>

0N/A

0N/A- <target name="build-tomcat-dbcp" unless="jdk16.present"

0N/A+ <target name="build-tomcat-dbcp"

0N/A depends="build-manifests">

0N/A <copy todir="${tomcat-dbcp.home}">

0N/A <fileset dir="${commons-pool.home}">

0N/A