- up to 7.0.94

[packages/tomcat.git] / tomcat-build.xml.patch

diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index b4b4e2dafec1b8d7d01e4284263112c9532bc94c..2f33c985237ab4291e1c17f805cc574b1726ba15 100644 (file)
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -1,28 +1,14 @@
 --- apache-tomcat-7.0.63-src/build.xml~        2015-06-30 11:15:44.000000000 +0300
 +++ apache-tomcat-7.0.63-src/build.xml 2015-07-26 21:31:46.613106110 +0300
-@@ -632,7 +574,7 @@
-   <target name="compile" depends="compile-java6,check-java7,compile-java7" />
+@@ -655,7 +655,7 @@
+   <target name="compile" depends="compile-java6, check-java7, compile-java7" />
  
    <target name="compile-java6"
--          depends="build-prepare,download-compile,compile-prepare,validate">
+-          depends="build-prepare, download-compile, compile-prepare, validate">
 +          depends="build-prepare">
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -937,13 +883,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">
 @@ -1198,7 +1198,7 @@
  
    </target>
@@ -41,7 +27,7 @@
            if="${test.cobertura}"
            description="Adds Cobertura instrumentation to the compiled bytecode">
  
-@@ -1430,52 +1369,10 @@
+@@ -1556,67 +1556,10 @@
      <mkdir dir="${tomcat.extras}/webservices"/>
    </target>
  
@@ -54,30 +40,45 @@
 -      <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
 -      <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>
@@ -105,7 +106,7 @@
        <fileset file="${log4j.jar}" />
        <fileset file="${logkit.jar}" />
        <fileset file="${servletapi.jar}" />
-@@ -1577,18 +1475,6 @@
+@@ -1660,24 +1660,6 @@
            depends="extras-prepare"
            description="Prepare to build web services extras package">
  
@@ -113,12 +114,18 @@
 -      <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}"
@@ -133,3 +140,18 @@
      <mkdir dir="${tomcat.dist}"/>
      <mkdir dir="${tomcat.dist}/bin"/>
      <mkdir dir="${tomcat.dist}/conf"/>
+@@ -1832,13 +1832,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}" />
+-
+-    <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+     </echo>
+