author | Petr Sumbera <petr.sumbera@oracle.com> |
Fri, 16 Dec 2016 02:21:15 -0800 | |
branch | s11u3-sru |
changeset 7507 | 4078062a67f6 |
parent 7490 | 6b9faa734468 |
child 7890 | 8f7cc4856a32 |
permissions | -rw-r--r-- |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
# |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
# CDDL HEADER START |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
# |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
# The contents of this file are subject to the terms of the |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
# Common Development and Distribution License (the "License"). |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
# You may not use this file except in compliance with the License. |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
# |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
# or http://www.opensolaris.org/os/licensing. |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
# See the License for the specific language governing permissions |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
# and limitations under the License. |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
# |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
# When distributing Covered Code, include this CDDL HEADER in each |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
# If applicable, add the following below this CDDL HEADER, with the |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
# fields enclosed by brackets "[]" replaced with your own identifying |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
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 |
# CDDL HEADER END |
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 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
# |
5535
ae5bc52953a4
22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5318
diff
changeset
|
23 |
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
# |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
include ../../make-rules/shared-macros.mk |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
|
2434
6c9bb5cf5610
15930486 - Auto-generation of Userland gate list for the Solaris 11 Update Release
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
28 |
COMPONENT_NAME= tomcat |
7507
4078062a67f6
25259176 Upgrade Apache Tomcat to version 8.5.9
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7490
diff
changeset
|
29 |
COMPONENT_VERSION= 8.5.9 |
609
775168282b2f
7037821 Userland migration of data from Makefile to manifest may have been a little overzealous
Rich Burridge <rich.burridge@oracle.com>
parents:
479
diff
changeset
|
30 |
COMPONENT_PROJECT_URL= http://tomcat.apache.org/ |
2434
6c9bb5cf5610
15930486 - Auto-generation of Userland gate list for the Solaris 11 Update Release
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
31 |
COMPONENT_SRC_NAME= apache-tomcat |
6c9bb5cf5610
15930486 - Auto-generation of Userland gate list for the Solaris 11 Update Release
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
32 |
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz |
800
2ad056ed89ec
7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
657
diff
changeset
|
34 |
COMPONENT_ARCHIVE_HASH= \ |
7507
4078062a67f6
25259176 Upgrade Apache Tomcat to version 8.5.9
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7490
diff
changeset
|
35 |
sha256:65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 |
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
36 |
COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) |
2434
6c9bb5cf5610
15930486 - Auto-generation of Userland gate list for the Solaris 11 Update Release
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
37 |
COMPONENT_BUGDB= utility/tomcat |
142
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 |
# Tomcat subcomponents |
6483
ee6fa154236b
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
40 |
COMPONENT_ARCHIVE_1= ecjsrc-4.5.1.jar |
800
2ad056ed89ec
7163771 sha1 should not be used in userland-fetch and userland component/*/Makefile
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
657
diff
changeset
|
41 |
COMPONENT_ARCHIVE_HASH_1= \ |
6483
ee6fa154236b
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
42 |
sha256:101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 |
ee6fa154236b
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
43 |
COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/$(COMPONENT_ARCHIVE_1) |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
|
7507
4078062a67f6
25259176 Upgrade Apache Tomcat to version 8.5.9
Petr Sumbera <petr.sumbera@oracle.com>
parents:
7490
diff
changeset
|
45 |
TPNO= 33003 |
3661
47545fb8aed4
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests
John Beck <John.Beck@Oracle.COM>
parents:
3175
diff
changeset
|
46 |
|
3996
20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
3661
diff
changeset
|
47 |
include $(WS_MAKE_RULES)/prep.mk |
20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
3661
diff
changeset
|
48 |
include $(WS_MAKE_RULES)/ant.mk |
20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
3661
diff
changeset
|
49 |
include $(WS_MAKE_RULES)/ips.mk |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
|
4134
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4005
diff
changeset
|
51 |
PATCH_LEVEL=0 |
b1148b9ffd9b
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4005
diff
changeset
|
52 |
|
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
53 |
COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR) |
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
54 |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
55 |
# Tomcat tests doesn't like cloning. |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
56 |
CLONEY=echo |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
57 |
COMPONENT_PRE_BUILD_ACTION= \ |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
58 |
$(CP) -r $(SOURCE_DIR)/* $(@D); |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
59 |
|
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
60 |
# Build ECJ jar from sources. |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
61 |
COMPONENT_PRE_BUILD_ACTION+= \ |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
62 |
($(MKDIR) $(@D)/ECJ/scripts/binary/META-INF; cd $(@D)/ECJ ; \ |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
63 |
$(JAVA_HOME)/bin/jar xf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1); \ |
6483
ee6fa154236b
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5535
diff
changeset
|
64 |
$(GPATCH) $(GPATCH_FLAGS) < $(COMPONENT_DIR)/$(PATCH_DIR)/ECJ.ecj-patch; \ |
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
65 |
$(CP) META-INF/MANIFEST.MF scripts/binary/META-INF/; \ |
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
66 |
JAVA_HOME="$(JAVA_HOME)" LC_ALL="en_US.UTF-8" $(ANT) ) |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
67 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
68 |
# Create configuration backup archive for custom user's deployments. |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
69 |
COMPONENT_POST_BUILD_ACTION= \ |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
70 |
(cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \ |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
71 |
gtar cfz conf/CONF.tar.gz conf/* ) |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
72 |
|
3054
6c3d483b5807
18466561 Upgrade Apache Tomcat to version 6.0.39
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2727
diff
changeset
|
73 |
ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
6c3d483b5807
18466561 Upgrade Apache Tomcat to version 6.0.39
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2727
diff
changeset
|
74 |
|
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
75 |
build: $(BUILD_32) |
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 |
install: build |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
78 |
|
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
79 |
test: $(SKIP_TEST) |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
80 |
|
4282
fcfeee656fe9
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4134
diff
changeset
|
81 |
REQUIRED_PACKAGES += developer/java/junit |
4005
4bcc81bdda4e
20708433 userland should build with java 8
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
3996
diff
changeset
|
82 |
REQUIRED_PACKAGES += runtime/java/jre-8 |
3996
20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
3661
diff
changeset
|
83 |
REQUIRED_PACKAGES += shell/ksh93 |
20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
3661
diff
changeset
|
84 |
REQUIRED_PACKAGES += system/core-os |
20c0f21bbe1e
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
3661
diff
changeset
|
85 |
REQUIRED_PACKAGES += system/network |