Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/tomcat/patches/build.xml.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Thu, 26 Jul 2012 01:47:24 -0700
changeset 930 b051ff1aad38
parent 479 c9b8e016b757
child 1084 8fac39a13695
permissions -rw-r--r--
7090667 proftpd.conf should have a man page
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
     1
 
--- apache-tomcat-6.0.33-src/build.xml	Tue Aug 16 05:26:13 2011
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
     2
 
+++ apache-tomcat-6.0.33-src/build.xml	Tue Aug 16 06:44:09 2011
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
     3
 
@@ -469,13 +469,6 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     4
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     5
 
   <target name="deploy" depends="build-only,build-docs,warn.dbcp">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     6
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     7
 
-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     8
 
-            file="${tomcat-native.tar.gz}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     9
 
-    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    10
 
-            file="${commons-daemon.native.src.tgz}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    11
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    12
 
-    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    13
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    14
 
     <!-- Copy scripts -->
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    15
 
     <copy todir="${tomcat.build}/bin">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    16
 
       <fileset dir="bin">
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    17
 
@@ -759,55 +752,6 @@
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    18
 
           description="Download (and build as necessary) dependent components"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    19
 
           depends="build-manifests">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    20
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    21
 
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    22
 
-      <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    23
 
-      <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    24
 
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    25
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    26
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    27
 
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    28
 
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    29
 
-      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win32/tcnative-1.dll"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    30
 
-      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win32/tcnative-1.dll"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    31
 
-      <param name="destfile" value="${tomcat-native.dll.win32}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    32
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    33
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    34
 
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    35
 
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    36
 
-      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/x64/tcnative-1.dll"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    37
 
-      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/x64/tcnative-1.dll"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    38
 
-      <param name="destfile" value="${tomcat-native.dll.x64}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    39
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    40
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    41
 
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    42
 
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    43
 
-      <param name="sourcefile.1" value="${tomcat-native.dll.1}/win64/ia64/tcnative-1.dll"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    44
 
-      <param name="sourcefile.2" value="${tomcat-native.dll.2}/win64/ia64/tcnative-1.dll"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    45
 
-      <param name="destfile" value="${tomcat-native.dll.i64}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    46
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    47
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    48
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    49
 
-    <!-- Download Commons Daemon -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    50
 
-    <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    51
 
-      <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    52
 
-      <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    53
 
-      <param name="destfile" value="${commons-daemon.jar}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    54
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    55
 
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    56
 
-    <antcall target="downloadfile-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    57
 
-      <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    58
 
-      <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    59
 
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    60
 
-      <param name="destdir" value="${commons-daemon.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    61
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    62
 
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    63
 
-    <antcall target="downloadzip-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    64
 
-      <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    65
 
-      <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    66
 
-      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    67
 
-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    68
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    69
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    70
 
     <!-- Build Tomcat DBCP bundle -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    71
 
     <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    72
 
       <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    73
 
@@ -832,15 +776,9 @@
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    74
 
       <param name="destdir" value="${jdt.home}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    75
 
     </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    76
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    77
 
-    <antcall target="downloadzip">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    78
 
-      <param name="sourcefile" value="${nsis.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    79
 
-      <param name="destfile" value="${nsis.exe}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    80
 
-      <param name="destdir" value="${nsis.home}/.."/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    81
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    82
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    83
 
   </target>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    84
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    85
 
-  <target name="build-tomcat-dbcp" unless="jdk16.present"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    86
 
+  <target name="build-tomcat-dbcp"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    87
 
           depends="build-manifests">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    88
 
     <copy todir="${tomcat-dbcp.home}">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    89
 
       <fileset dir="${commons-pool.home}">
upstream/oracle/userland-gate