components/web/tomcat-8/patches/build.xml.patch

   1 Patch origin: in-house
   2 Patch status: Solaris-specific; not suitable for upstream
   3
   4 Download/use only archives we really need.
   5 Don't install unnecessary stuff.
   6
   7 diff --git a/build.xml b/build.xml
   8 index 5524d4c..f3a7ef1 100644
   9 --- a/build.xml
  10 +++ b/build.xml
  11 @@ -1031,8 +1031,6 @@
  12    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
  13            description="Default. Builds a working Tomcat instance">
  14
  15 -    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
  16 -
  17      <!-- Copy scripts -->
  18      <copy todir="${tomcat.build}/bin">
  19        <fileset dir="bin">
  20 @@ -1781,12 +1779,6 @@
  21        </fileset>
  22      </copy>
  23
  24 -    <!-- Source bundles for native components -->
  25 -    <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
  26 -            file="${tomcat-native.tar.gz}" />
  27 -    <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
  28 -            file="${commons-daemon.native.src.tgz}" />
  29 -
  30      <!-- platform README files -->
  31      <echo append="false" file="${tomcat.dist}/bin/x64/README">
  32  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
  33 @@ -2634,16 +2626,6 @@ skip.installer property in build.properties" />
  34    <target name="download-compile"
  35            description="Download components necessary to compile" >
  36
  37 -    <!-- Download Commons Daemon -->
  38 -    <antcall target="downloadgz-2">
  39 -      <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
  40 -      <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
  41 -      <param name="destfile" value="${commons-daemon.jar}"/>
  42 -      <param name="checksum.enabled" value="${commons-daemon.bin.checksum.enabled}"/>
  43 -      <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
  44 -      <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
  45 -    </antcall>
  46 -
  47      <!-- Download JDT (Eclipse compiler) -->
  48      <antcall target="downloadfile-2">
  49        <param name="sourcefile.1" value="${jdt.loc.1}"/>
  50 @@ -2738,16 +2720,6 @@ skip.installer property in build.properties" />
  51    <target name="download-dist"
  52            description="Download additional components for a distribution" >
  53
  54 -    <antcall target="downloadfile-2">
  55 -      <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
  56 -      <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
  57 -      <param name="destfile" value="${tomcat-native.tar.gz}"/>
  58 -      <param name="destdir" value="${tomcat-native.home}"/>
  59 -      <param name="checksum.enabled" value="${tomcat-native.src.checksum.enabled}"/>
  60 -      <param name="checksum.algorithm" value="${tomcat-native.src.checksum.algorithm}"/>
  61 -      <param name="checksum.value" value="${tomcat-native.src.checksum.value}"/>
  62 -    </antcall>
  63 -
  64      <antcall target="downloadzip-2">
  65        <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
  66        <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
  67 @@ -2758,16 +2730,6 @@ skip.installer property in build.properties" />
  68        <param name="checksum.value" value="${tomcat-native.win.checksum.value}"/>
  69      </antcall>
  70
  71 -    <antcall target="downloadfile-2">
  72 -      <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
  73 -      <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
  74 -      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
  75 -      <param name="destdir" value="${commons-daemon.home}"/>
  76 -      <param name="checksum.enabled" value="${commons-daemon.native.src.checksum.enabled}"/>
  77 -      <param name="checksum.algorithm" value="${commons-daemon.native.src.checksum.algorithm}"/>
  78 -      <param name="checksum.value" value="${commons-daemon.native.src.checksum.value}"/>
  79 -    </antcall>
  80 -
  81      <antcall target="downloadzip-2">
  82        <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
  83        <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>