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, 22 Feb 2013 01:07:26 -0800
changeset 1166 36691b5d318b
parent 1084 8fac39a13695
child 4089 1788e52b3086
permissions -rw-r--r--
16024185 tomcat doesn't build with jdk 1.7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1166
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
     1
 
--- apache-tomcat-6.0.36-src/build.xml
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
     2
 
+++ apache-tomcat-6.0.36-src/build.xml
1084
8fac39a13695 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset 
     3
 
@@ -487,13 +487,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">
1084
8fac39a13695 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset 
    17
 
@@ -777,41 +770,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
 
-
1084
8fac39a13695 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset 
    28
 
-    <antcall target="downloadzip-2">
8fac39a13695 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset 
    29
 
-      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
8fac39a13695 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset 
    30
 
-      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
8fac39a13695 15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents: 479
diff changeset 
    31
 
-      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
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
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    35
 
-    <!-- Download Commons Daemon -->
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    36
 
-    <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    37
 
-      <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 
    38
 
-      <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 
    39
 
-      <param name="destfile" value="${commons-daemon.jar}"/>
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="${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 
    44
 
-      <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 
    45
 
-      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    46
 
-      <param name="destdir" value="${commons-daemon.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
 
-
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    49
 
-    <antcall target="downloadzip-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    50
 
-      <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 
    51
 
-      <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 
    52
 
-      <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 
    53
 
-      <param name="destdir" value="${commons-daemon.native.win.home}"/>
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
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    56
 
     <!-- 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 
    57
 
     <antcall target="downloadgz-2">
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    58
 
       <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
1166
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    59
 
@@ -823,6 +781,11 @@
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    60
 
       <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    61
 
       <param name="destfile" value="${commons-dbcp.home}/build.xml" />
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    62
 
     </antcall>
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    63
 
+    <!-- We need to patch DBCP so it can be built with JDK 1.7. -->
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    64
 
+    <exec executable="sh">
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    65
 
+      <arg value="-c" />
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    66
 
+      <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    67
 
+    </exec>
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    68
 
     <mkdir dir="${tomcat-dbcp.home}"/>
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    69
 
     <antcall target="build-tomcat-dbcp">
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    70
 
       <param name="basedir" value="${tomcat-dbcp.home}" />
36691b5d318b 16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents: 1084
diff changeset 
    71
 
@@ -836,15 +799,9 @@
479
c9b8e016b757 7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents: 142
diff changeset 
    72
 
       <param name="destdir" value="${jdt.home}"/>
142
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    73
 
     </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    74
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    75
 
-    <antcall target="downloadzip">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    76
 
-      <param name="sourcefile" value="${nsis.loc}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    77
 
-      <param name="destfile" value="${nsis.exe}"/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    78
 
-      <param name="destdir" value="${nsis.home}/.."/>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    79
 
-    </antcall>
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    80
 
-
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    81
 
   </target>
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 name="build-tomcat-dbcp" unless="jdk16.present"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    84
 
+  <target name="build-tomcat-dbcp"
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    85
 
           depends="build-manifests">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    86
 
     <copy todir="${tomcat-dbcp.home}">
6f1cb90a0ef3 7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    87
 
       <fileset dir="${commons-pool.home}">
upstream/oracle/userland-gate