build.xml.patch revision 479
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster--- apache-tomcat-6.0.33-src/build.xml Tue Aug 16 05:26:13 2011
1f48f8236de7de97be1c6b9d06bef50b379c8801jenkins+++ apache-tomcat-6.0.33-src/build.xml Tue Aug 16 06:44:09 2011
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster@@ -469,13 +469,6 @@
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster <target name="deploy" depends="build-only,build-docs,warn.dbcp">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster <!-- Copy scripts -->
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster <copy todir="${tomcat.build}/bin">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster <fileset dir="bin">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster@@ -759,55 +752,6 @@
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster description="Download (and build as necessary) dependent components"
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster depends="build-manifests">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <antcall target="downloadfile-2">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destfile" value="${tomcat-native.tar.gz}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destdir" value="${tomcat-native.home}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <antcall target="downloadfile-2">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destfile" value="${tomcat-native.dll.win32}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destdir" value="${tomcat-native.home}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <antcall target="downloadfile-2">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destfile" value="${tomcat-native.dll.x64}"/>
79943d71bcf8d4933e74f29a1b0e87f8898508cbPeter Major- <param name="destdir" value="${tomcat-native.home}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <antcall target="downloadfile-2">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
79943d71bcf8d4933e74f29a1b0e87f8898508cbPeter Major- <param name="destfile" value="${tomcat-native.dll.i64}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destdir" value="${tomcat-native.home}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <!-- Download Commons Daemon -->
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <antcall target="downloadgz-2">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destfile" value="${commons-daemon.jar}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <antcall target="downloadfile-2">
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
3a1076834ccd4b3ecf4fac754b7ba662d4251020Allan Foster- <param name="destdir" value="${commons-daemon.home}"/>
- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
- <param name="destdir" value="${commons-daemon.native.win.home}"/>
<param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
<param name="destdir" value="${jdt.home}"/>
- <param name="sourcefile" value="${nsis.loc}"/>
- <param name="destfile" value="${nsis.exe}"/>
- <param name="destdir" value="${nsis.home}/.."/>
- <target name="build-tomcat-dbcp" unless="jdk16.present"
<copy todir="${tomcat-dbcp.home}">
<fileset dir="${commons-pool.home}">