X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftomcat.git;a=blobdiff_plain;f=tomcat-build.xml.patch;h=9f1726abc63c6a84fece2ae59ef5c3628397f197;hp=1dd97c4a0ca1b5e590595060fd99170a01097f42;hb=f7072f1;hpb=70d2c6e874d30cf1ca68073c62c49d536307d805

diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index 1dd97c4..9f1726a 100644
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -1,92 +1,33 @@
---- apache-tomcat-7.0.26-src/build.xml	2012-02-17 15:15:30.000000000 +0100
-+++ apache-tomcat-7.0.26-src.new/build.xml	2012-03-19 10:05:29.185332581 +0100
-@@ -438,53 +438,6 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
--    <!-- Required so we can cache checkstyle results -->
--    <mkdir dir="${tomcat.output}/res/checkstyle"/>
--
--    <taskdef resource="checkstyletask.properties"
--             classpath="${checkstyle.jar}" />
--    <checkstyle config="res/checkstyle/checkstyle.xml">
--      <fileset dir="." >
--        <patternset refid="text.files" />
--        <include name="**/*.bat"/>
--        <include name="**/*.sh"/>
--        <exclude name="bin/setenv.*"/>
--        <exclude name=".*/**"/>
--        <exclude name="output/**"/>
--        <exclude name="modules/**"/>
--        <exclude name="**/*.mdl"/>
--        <exclude name="**/*_2.xml"/>
--        <exclude name="res/checkstyle/header-al2.txt"/>
--        <!-- Exclude auto-generated files -->
--        <exclude name="java/org/apache/el/parser/ELParser*.java" />
--        <exclude name="java/org/apache/el/parser/JJTELParserState.java" />
--        <exclude name="java/org/apache/el/parser/Node.java" />
--        <exclude name="java/org/apache/el/parser/ParseException.java" />
--        <exclude name="java/org/apache/el/parser/SimpleCharStream.java" />
--        <exclude name="java/org/apache/el/parser/Token*.java" />
--        <!-- Exclude these else Gump runs validate on them -->
--        <exclude name="**/org/apache/tomcat/dbcp/**"/>
--        <exclude name="**/tomcat-deps/**"/>
--      </fileset>
--      <fileset dir="modules/jdbc-pool" >
--        <patternset refid="text.files" />
--      </fileset>
--    </checkstyle>
--    <!-- javax package checks -->
--    <checkstyle config="res/checkstyle/javax-checkstyle.xml">
--      <fileset dir="java/javax" >
--        <include name="**/*.java"/>
--      </fileset>
--    </checkstyle>
--    <!-- org package checks -->
--    <checkstyle config="res/checkstyle/org-checkstyle.xml">
--      <fileset dir="java/org" >
--        <include name="**/*.java"/>
--      </fileset>
--    </checkstyle>
--  </target>
--
-   <target name="validate-eoln" depends="compile"
-     description="Validate that the source files have correct line ends">
-     <taskdef name="checkeol"
-@@ -524,7 +477,7 @@
-     </copy>
-   </target>
+--- apache-tomcat-7.0.100-src/build.xml.org	2020-02-11 09:39:54.000000000 +0100
++++ apache-tomcat-7.0.100-src/build.xml	2020-02-29 19:19:42.236875428 +0100
+@@ -683,7 +683,7 @@
+   <target name="compile" depends="compile-java6, check-java7, compile-java7" />
  
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare">
+   <target name="compile-java6"
+-          depends="build-prepare, download-compile, compile-prepare, validate">
++          depends="build-prepare">
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -807,13 +760,6 @@
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
- 
--    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
--            file="${tomcat-native.tar.gz}" />
--    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
--            file="${commons-daemon.native.src.tgz}" />
--
--    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1078,7 +1024,7 @@
+@@ -1409,7 +1409,7 @@
  
    </target>
  
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
+-  <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
++  <target name="test-compile" depends="compile,compile-webapp-examples" >
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
-@@ -1183,52 +1129,10 @@
+@@ -1621,7 +1621,7 @@
+   </target>
+ 
+   <target name="cobertura-instrument"
+-          depends="compile,download-cobertura,cobertura-disabled,cobertura-disabled-log"
++          depends="compile,cobertura-disabled,cobertura-disabled-log"
+           if="${cobertura.enabled}"
+           description="Adds Cobertura instrumentation to the compiled bytecode">
+ 
+@@ -1667,66 +1667,10 @@
      <mkdir dir="${tomcat.extras}/webservices"/>
    </target>
  
@@ -94,42 +35,56 @@
 -          depends="extras-prepare"
 -          description="Prepare to build web services extras package">
 -
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${commons-logging-src.loc}"/>
 -      <param name="destfile" value="${commons-logging-src.tar.gz}"/>
 -      <param name="destdir" value="${commons-logging.home}"/>
+-      <param name="checksum.enabled" value="${commons-logging-src.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${commons-logging-src.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${commons-logging-src.checksum.value}"/>
 -    </antcall>
 -
 -    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${avalon-framework.loc}"/>
 -      <param name="destfile" value="${avalon-framework.jar}"/>
 -      <param name="destdir" value="${avalon-framework.home}"/>
+-      <param name="checksum.enabled" value="${avalon-framework.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${avalon-framework.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${avalon-framework.checksum.value}"/>
 -    </antcall>
 -
 -    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${log4j.loc}"/>
 -      <param name="destfile" value="${log4j.jar}"/>
 -      <param name="destdir" value="${log4j.home}"/>
+-      <param name="checksum.enabled" value="${log4j.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${log4j.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${log4j.checksum.value}"/>
 -    </antcall>
 -
 -    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${logkit.loc}"/>
 -      <param name="destfile" value="${logkit.jar}"/>
 -      <param name="destdir" value="${logkit.home}"/>
+-      <param name="checksum.enabled" value="${logkit.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${logkit.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${logkit.checksum.value}"/>
 -    </antcall>
 -
 -    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${servletapi.loc}"/>
 -      <param name="destfile" value="${servletapi.jar}"/>
 -      <param name="destdir" value="${servletapi.home}"/>
+-      <param name="checksum.enabled" value="${servletapi.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${servletapi.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${servletapi.checksum.value}"/>
 -    </antcall>
 -
 -  </target>
 -
    <target name="extras-commons-logging"
 -          depends="extras-commons-logging-prepare,compile,build-manifests"
-+          depends="extras-prepare,compile,build-manifests"
++          depends="compile,build-manifests"
            description="Build JULI for log4j extras package">
  
 -    <gunzip src="${commons-logging-src.tar.gz}"
@@ -137,10 +92,10 @@
 -    <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
 -      dest="${tomcat.extras}/logging/"/>
 -
-     <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
+     <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
          encoding="ISO-8859-1">
        <replacefilter token="org.apache.commons"
-@@ -1250,7 +1154,8 @@
+@@ -1763,7 +1706,8 @@
        file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
  
      <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
@@ -150,7 +105,7 @@
        <fileset file="${log4j.jar}" />
        <fileset file="${logkit.jar}" />
        <fileset file="${servletapi.jar}" />
-@@ -1330,18 +1235,6 @@
+@@ -1842,24 +1786,6 @@
            depends="extras-prepare"
            description="Prepare to build web services extras package">
  
@@ -158,18 +113,24 @@
 -      <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
 -      <param name="destfile" value="${jaxrpc-lib.jar}"/>
 -      <param name="destdir" value="${jaxrpc-lib.home}"/>
+-      <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
 -    </antcall>
 -
 -    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
 -      <param name="destfile" value="${wsdl4j-lib.jar}"/>
 -      <param name="destdir" value="${wsdl4j-lib.home}"/>
+-      <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/>
+-      <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+-      <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
 -    </antcall>
 -
      <copy file="${jaxrpc-lib.jar}"
            tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
      <copy file="${wsdl4j-lib.jar}"
-@@ -1448,7 +1341,7 @@
+@@ -1961,7 +1887,7 @@
  
    </target>
  
@@ -178,308 +139,26 @@
      <mkdir dir="${tomcat.dist}"/>
      <mkdir dir="${tomcat.dist}/bin"/>
      <mkdir dir="${tomcat.dist}/conf"/>
-@@ -2236,304 +2129,6 @@
-     <delete file="webapps/docs/jdbc-pool.xml"/>
-   </target>
+@@ -2034,13 +1960,6 @@
+       </fileset>
+     </copy>
  
--    
--  <!-- ================ Download and dependency building =================== -->
--
--  <target name="download-validate"
--          description="Download components necessary to validate source"
--          if="${execute.validate}">
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${checkstyle.loc}"/>
--      <param name="destfile" value="${checkstyle.jar}"/>
--      <param name="destdir" value="${base.path}"/>
--    </antcall>
--
--  </target>
--
--  <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
--
--    <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}"/>
--    </antcall>
--
--    <!-- 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}"/>
--    </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}"/>
--    </antcall>
--
--    <!-- Download src and build Tomcat DBCP bundle -->
--    <antcall target="downloadgz-2">
--      <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
--      <param name="destfile" value="${commons-pool.home}/build.xml" />
--    </antcall>
--    <antcall target="downloadgz-2">
--      <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
--      <param name="destfile" value="${commons-dbcp.home}/build.xml" />
--    </antcall>
--    <mkdir dir="${tomcat-dbcp.home}"/>
--    <!-- Rebuild dbcp only if built jars do not exist -->
--    <!-- or new versions of pool or dbcp have been downloaded. -->
--    <condition property="no.build.dbcp">
--      <and>
--        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
--        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
--        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
--        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
--      </and>
--    </condition>
--    <antcall target="build-tomcat-dbcp" />
--
--    <!-- Download JDT (Eclipse compiler) -->
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${jdt.loc.1}"/>
--      <param name="sourcefile.2" value="${jdt.loc.2}"/>
--      <param name="destfile" value="${jdt.jar}"/>
--      <param name="destdir" value="${jdt.home}"/>
--    </antcall>
--  </target>
--
--  <target name="download-test-compile"
--          description="Download additional components for the tests" >
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${junit.loc}"/>
--      <param name="destfile" value="${junit.jar}"/>
--      <param name="destdir" value="${base.path}"/>
--    </antcall>
--
--  </target>
--
--  <target name="download-dist"
--          description="Download additional components for a distribution" >
--
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
--      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
--      <param name="destfile" value="${tomcat-native.dll.win32}"/>
--      <param name="destdir" value="${tomcat-native.home}"/>
--    </antcall>
--
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
--      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
--      <param name="destfile" value="${tomcat-native.dll.x64}"/>
--      <param name="destdir" value="${tomcat-native.home}"/>
--    </antcall>
--
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
--      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
--      <param name="destfile" value="${tomcat-native.dll.i64}"/>
--      <param name="destdir" value="${tomcat-native.home}"/>
--    </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}"/>
--      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
--      <param name="destdir" value="${commons-daemon.native.win.home}"/>
--    </antcall>
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${nsis.loc}"/>
--      <param name="destfile" value="${nsis.exe}"/>
--      <param name="destdir" value="${nsis.home}/.."/>
--    </antcall>
--
--  </target>
--
--
--  <!-- =============== Targets for dependencies that need to =============== -->
--  <!-- ================  be built rather than used directly ================ -->
--
--  <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
--    <copy todir="${tomcat-dbcp.home}">
--      <fileset dir="${commons-pool.home}">
--        <include name="**/*.java" />
--        <exclude name="**/test/**" />
--      </fileset>
--      <fileset dir="${commons-dbcp.home}">
--        <include name="**/*.java" />
--        <exclude name="**/test/**" />
--        <exclude name="**/managed/**" />
--      </fileset>
--    </copy>
--    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
--        encoding="ISO-8859-1">
--      <replacefilter token="org.apache.commons"
--            value="org.apache.tomcat.dbcp" />
--    </replace>
--    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
--        encoding="ISO-8859-1">
--      <replacefilter token="enum"
--            value="enumeration" />
--    </replace>
--
--    <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
--    <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
--      <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
--    </move>
--    <mkdir dir="${tomcat-dbcp.home}/classes"/>
--    <javac destdir="${tomcat-dbcp.home}/classes"
--           optimize="off"
--           debug="${compile.debug}"
--           deprecation="${compile.deprecation}"
--           source="${compile.source}"
--           target="${compile.target}"
--           sourcepath="${tomcat-dbcp.home}/src/java"
--           srcdir="${tomcat-dbcp.home}/src/java"
--           encoding="ISO-8859-1"
--           includeantruntime="false">
--      <include name="**" />
--    </javac>
--    <jarIt jarfile="${tomcat-dbcp.jar}"
--      filesDir="${tomcat-dbcp.home}/classes"
--      filesId="files.tomcat-dbcp" />
--    <jarIt jarfile="${tomcat-dbcp-src.jar}"
--      filesDir="${tomcat-dbcp.home}/src/java"
--      filesId="files.tomcat-dbcp" />
--  </target>
--
--  <!-- =============== Utility Targets to support downloads ================ -->
--
--  <target name="proxyflags">
--    <!-- check proxy parameters. -->
--    <condition property="useproxy">
--      <equals arg1="${proxy.use}" arg2="on" />
--    </condition>
--  </target>
--
--  <target name="setproxy" depends="proxyflags" if="useproxy">
--    <taskdef name="setproxy"
--            classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
--    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
--              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
--    <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
--  </target>
--
--  <target name="testexist">
--    <echo message="Testing  for ${destfile}"/>
--    <available file="${destfile}" property="exist"/>
--  </target>
--
--  <target name="downloadgz" unless="exist" depends="setproxy,testexist">
--    <!-- Download and extract the package -->
--    <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
--    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
--    <untar src="${base.path}/file.tar" dest="${base.path}"/>
--    <delete file="${base.path}/file.tar"/>
--    <delete file="${base.path}/file.tar.gz"/>
--  </target>
--
--  <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
--    <!-- Download and extract the package from the two alternative locations -->
--    <delete file="${base.path}/file.tar" quiet="true" />
--    <delete file="${base.path}/file.tar.gz" quiet="true" />
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.1}" />
--      <param name="destfile" value="${base.path}/file.tar.gz" />
--    </antcall>
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.2}" />
--      <param name="destfile" value="${base.path}/file.tar.gz" />
--    </antcall>
--    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
--    <untar src="${base.path}/file.tar" dest="${base.path}"/>
--    <delete file="${base.path}/file.tar"/>
--    <delete file="${base.path}/file.tar.gz"/>
--  </target>
--
--  <target name="downloadzip" unless="exist" depends="setproxy,testexist">
--    <!-- Download and extract the package -->
--    <get src="${sourcefile}" dest="${base.path}/file.zip" />
--    <mkdir dir="${destdir}" />
--    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
--    <delete file="${base.path}/file.zip"/>
--  </target>
--
--  <target name="downloadzip-2" unless="exist" depends="testexist">
--    <!-- Download and extract the package from the two alternative locations -->
--    <delete file="${base.path}/file.zip" quiet="true" />
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.1}" />
--      <param name="destfile" value="${base.path}/file.zip" />
--    </antcall>
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.2}" />
--      <param name="destfile" value="${base.path}/file.zip" />
--    </antcall>
--    <mkdir dir="${destdir}" />
--    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
--    <delete file="${base.path}/file.zip"/>
--  </target>
--
--  <target name="downloadfile" unless="exist" depends="setproxy,testexist">
--    <!-- Download extract the file -->
--    <mkdir dir="${destdir}" />
--    <get src="${sourcefile}" dest="${destfile}" />
--  </target>
--
--  <target name="downloadfile-2" unless="exist" depends="testexist">
--    <!-- Download the file from the two alternative locations -->
--    <mkdir dir="${destdir}" />
--
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.1}" />
--    </antcall>
--
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.2}" />
--    </antcall>
--
--    <available file="${destfile}" property="exist"/>
--    <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
--  </target>
--
--  <target name="trydownload.check" depends="setproxy">
--    <condition property="trydownload.run">
--      <and>
--        <not>
--          <available file="${destfile}" />
--        </not>
--        <http url="${sourcefile}" />
--      </and>
--    </condition>
--  </target>
--
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
--    <!-- Downloads a file if not yet downloaded and the source URL is available -->
--    <get src="${sourcefile}" dest="${destfile}" />
--  </target>
--
--  <!-- ============================ IDE Support ============================ -->
--
--  <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
--          description="Prepares the source tree to be built in Eclipse">
--
--    <!-- Copy the sample project files into the root directory -->
--    <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
--    <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.classpath" tofile="${tomcat.home}/.classpath"/>
--
--    <echo>Eclipse project files created.
--Read the Building page on the Apache Tomcat documentation site for details on how to configure your Eclipse workplace.</echo>
--  </target>
+-    <!-- 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}" />
 -
-   <!-- ======================= Macros, Taskdefs etc ======================== -->
+-    <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+     </echo>
+@@ -2791,7 +2791,7 @@ skip.installer property in build.propert
+ 
+   <target name="download-deps"
+           description="Download the dependencies required to build and test"
+-          depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-commons-logging-prepare, extras-webservices-prepare" />
++          depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-webservices-prepare" />
  
-   <macrodef name="jarIt" description="utility macro for standard JAR packaging">
+   <target name="download-validate"
+           description="Download components necessary to validate source"