| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Thu, 16 Apr 2015 01:36:32 -0700 | |
| branch | s11u2-sru |
| changeset 4146 | 097063f324c0 |
| parent 2602 | 5caab247ea3d |
| child 5535 | ae5bc52953a4 |
| permissions | -rw-r--r-- |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
1 |
Patch origin: in-house |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
2 |
Patch status: Solaris-specific; not suitable for upstream |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
3 |
|
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
4 |
Download/use only archives we really need. |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
5 |
Don't install unnecessary stuff. |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
6 |
Allow to build it with desired JDK version. |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
7 |
|
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
8 |
--- build.xml |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
9 |
+++ build.xml |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
10 |
@@ -492,13 +492,6 @@ |
|
142
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 |
<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
|
13 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
- file="${tomcat-native.tar.gz}" />
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
- <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
|
17 |
- file="${commons-daemon.native.src.tgz}" />
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
- |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
- <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
|
20 |
- |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
<!-- Copy scripts --> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
<copy todir="${tomcat.build}/bin">
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
<fileset dir="bin"> |
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
24 |
@@ -780,41 +773,6 @@ |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
description="Download (and build as necessary) dependent components" |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
depends="build-manifests"> |
|
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.loc.1}"/>
|
|
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.loc.2}"/>
|
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
- <param name="destfile" value="${tomcat-native.tar.gz}"/>
|
|
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 |
- |
|
2474
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
35 |
- <antcall target="downloadzip-2"> |
|
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
36 |
- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
|
|
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
37 |
- <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
|
|
c9068cb41676
15990838 Upgrade Apache Tomcat to version 6.0.36
Petr Sumbera <petr.sumbera@oracle.com>
parents:
479
diff
changeset
|
38 |
- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
|
|
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 |
- |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
- <!-- Download Commons Daemon --> |
|
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
43 |
- <antcall target="downloadgz-2"> |
|
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
44 |
- <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
|
45 |
- <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
|
46 |
- <param name="destfile" value="${commons-daemon.jar}"/>
|
|
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="downloadfile-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.src.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.src.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.src.tgz}"/>
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
- <param name="destdir" value="${commons-daemon.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 |
- |
|
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
56 |
- <antcall target="downloadzip-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.win.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.win.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.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 --> |
|
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
64 |
<antcall target="downloadgz-2"> |
|
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
65 |
<param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
|
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
66 |
@@ -826,6 +784,11 @@ |
|
2602
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
67 |
<param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
|
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
68 |
<param name="destfile" value="${commons-dbcp.home}/build.xml" />
|
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
69 |
</antcall> |
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
70 |
+ <!-- We need to patch DBCP so it can be built with JDK 1.7. --> |
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
71 |
+ <exec executable="sh"> |
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
72 |
+ <arg value="-c" /> |
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
73 |
+ <arg value="cat ../../jdbc41.patch | gpatch -d ${commons-dbcp.home} -p0" />
|
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
74 |
+ </exec> |
|
5caab247ea3d
16024185 tomcat doesn't build with jdk 1.7
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2474
diff
changeset
|
75 |
<mkdir dir="${tomcat-dbcp.home}"/>
|
|
4146
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
76 |
<antcall target="build-tomcat-dbcp" /> |
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
77 |
|
|
097063f324c0
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2602
diff
changeset
|
78 |
@@ -837,15 +800,9 @@ |
|
479
c9b8e016b757
7080654 Upgrade Apache Tomcat to version 6.0.33
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
79 |
<param name="destdir" value="${jdt.home}"/>
|
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
80 |
</antcall> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
81 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
82 |
- <antcall target="downloadzip"> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
83 |
- <param name="sourcefile" value="${nsis.loc}"/>
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
84 |
- <param name="destfile" value="${nsis.exe}"/>
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
85 |
- <param name="destdir" value="${nsis.home}/.."/>
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
86 |
- </antcall> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
87 |
- |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
88 |
</target> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
89 |
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
90 |
- <target name="build-tomcat-dbcp" unless="jdk16.present" |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
91 |
+ <target name="build-tomcat-dbcp" |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
92 |
depends="build-manifests"> |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
93 |
<copy todir="${tomcat-dbcp.home}">
|
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
94 |
<fileset dir="${commons-pool.home}">
|