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 Petr Sumbera <petr.sumbera@oracle.com>
Fri, 18 Mar 2011 12:47:51 -0700
changeset 142 6f1cb90a0ef3
child 479 c9b8e016b757
permissions -rw-r--r--
7026996 move tomcat to userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     1
 
--- apache-tomcat-6.0.28-src/build.xml.orig	Tue Jun 29 07:33:40 2010
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     2
 
+++ apache-tomcat-6.0.28-src/build.xml	Fri Jul  9 08:12:35 2010
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
     3
 
@@ -471,13 +471,6 @@
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">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    17
 
@@ -696,48 +689,6 @@
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
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    21
 
-    <antcall target="downloadfile">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    22
 
-      <param name="sourcefile" value="${tomcat-native.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    23
 
-      <param name="destfile" value="${tomcat-native.tar.gz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    24
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    25
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    26
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    27
 
-    <antcall target="downloadfile">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    28
 
-      <param name="sourcefile" value="${tomcat-native.dll}/win32/tcnative-1.dll"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    29
 
-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x86"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    30
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    31
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    32
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    33
 
-    <antcall target="downloadfile">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    34
 
-      <param name="sourcefile" value="${tomcat-native.dll}/win64/x64/tcnative-1.dll"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    35
 
-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.x64"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    36
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    37
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    38
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    39
 
-    <antcall target="downloadfile">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    40
 
-      <param name="sourcefile" value="${tomcat-native.dll}/win64/ia64/tcnative-1.dll"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    41
 
-      <param name="destfile" value="${tomcat-native.home}/tcnative-1.dll.i64"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    42
 
-      <param name="destdir" value="${tomcat-native.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    43
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    44
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    45
 
-    <!-- Download Commons Daemon -->
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    46
 
-    <antcall target="downloadgz">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    47
 
-      <param name="sourcefile" value="${commons-daemon.bin.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    48
 
-      <param name="destfile" value="${commons-daemon.jar}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    49
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    50
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    51
 
-    <antcall target="downloadfile">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    52
 
-      <param name="sourcefile" value="${commons-daemon.native.src.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    53
 
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    54
 
-      <param name="destdir" value="${commons-daemon.home}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    55
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    56
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    57
 
-    <antcall target="downloadzip">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    58
 
-      <param name="sourcefile" value="${commons-daemon.native.win.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    59
 
-      <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 
    60
 
-      <param name="destdir" value="${commons-daemon.native.win.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
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    63
 
     <!-- Build Tomcat DBCP bundle -->
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    64
 
     <antcall target="downloadgz">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    65
 
       <param name="sourcefile" value="${commons-pool-src.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    66
 
@@ -763,15 +714,9 @@
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    67
 
       <param name="basedir" value="${jasper-jdt.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
 
-    <antcall target="downloadzip">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    71
 
-      <param name="sourcefile" value="${nsis.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    72
 
-      <param name="destfile" value="${nsis.exe}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    73
 
-      <param name="destdir" value="${nsis.home}/.."/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    74
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    75
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    76
 
   </target>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    77
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    78
 
-  <target name="build-tomcat-dbcp" unless="jdk16.present"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    79
 
+  <target name="build-tomcat-dbcp"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    80
 
           depends="build-manifests">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    81
 
     <copy todir="${tomcat-dbcp.home}">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    82
 
       <fileset dir="${commons-pool.home}">
upstream/oracle/userland-gate