author | Petr Sumbera <petr.sumbera@oracle.com> |
Tue, 22 Nov 2016 04:23:48 -0800 | |
changeset 7465 | 77b12a9cd053 |
parent 6925 | 71a106abd05d |
child 7499 | 21e40dad7dd3 |
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 |
# |
5506
8288047a41d7
22817809 Upgrade Apache Tomcat to version 8.0.32
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5201
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 |
# |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
25 |
BUILD_BITS= NO_ARCH |
142
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 |
|
1048
e82fa02a4d16
15863968 Auto-generation of Userland gate list - Phase 1.
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
28 |
COMPONENT_NAME= tomcat |
7465
77b12a9cd053
25221325 Upgrade Apache Tomcat to version 8.5.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
6925
diff
changeset
|
29 |
COMPONENT_VERSION= 8.5.8 |
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/ |
1048
e82fa02a4d16
15863968 Auto-generation of Userland gate list - Phase 1.
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
31 |
COMPONENT_SRC_NAME= apache-tomcat |
e82fa02a4d16
15863968 Auto-generation of Userland gate list - Phase 1.
Rich Burridge <rich.burridge@oracle.com>
parents:
800
diff
changeset
|
32 |
COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src |
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
|
33 |
COMPONENT_ARCHIVE_HASH= \ |
7465
77b12a9cd053
25221325 Upgrade Apache Tomcat to version 8.5.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
6925
diff
changeset
|
34 |
sha256:ee58ee69d536d7a8f748ed7b334eb2161d3d75664f0c87178b12fe5eebbbe45f |
4248
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
35 |
COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
# Tomcat subcomponents |
6267
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5682
diff
changeset
|
38 |
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
|
39 |
COMPONENT_ARCHIVE_HASH_1= \ |
6267
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5682
diff
changeset
|
40 |
sha256:101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 |
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5682
diff
changeset
|
41 |
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
|
42 |
|
7465
77b12a9cd053
25221325 Upgrade Apache Tomcat to version 8.5.8
Petr Sumbera <petr.sumbera@oracle.com>
parents:
6925
diff
changeset
|
43 |
TPNO= 32738 |
1948
2d1537e7942d
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests
John Beck <John.Beck@Oracle.COM>
parents:
1939
diff
changeset
|
44 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
45 |
BUILD_STYLE= ant |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
46 |
TEST_TARGET= $(SKIP_TEST) |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
47 |
SYSTEM_TEST_TARGET= $(SKIP_TEST) |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
48 |
include $(WS_MAKE_RULES)/common.mk |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
|
4089
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3959
diff
changeset
|
50 |
PATCH_LEVEL=0 |
1788e52b3086
20843475 Upgrade Apache Tomcat to version 6.0.43
Petr Sumbera <petr.sumbera@oracle.com>
parents:
3959
diff
changeset
|
51 |
|
4248
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
52 |
COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_NO_ARCH) -Dtomcat.build=$(PROTO_DIR) |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
53 |
|
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
54 |
# Tomcat tests doesn't like cloning. |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
55 |
CLONEY=echo |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
56 |
COMPONENT_PRE_BUILD_ACTION= \ |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
57 |
$(CP) -r $(SOURCE_DIR)/* $(@D); |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
58 |
|
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
59 |
# Build ECJ jar from sources. |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
60 |
COMPONENT_PRE_BUILD_ACTION+= \ |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
61 |
($(MKDIR) $(@D)/ECJ/scripts/binary/META-INF; cd $(@D)/ECJ ; \ |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
62 |
$(JAVA_HOME)/bin/jar xf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1); \ |
6267
c6b5d4730d84
23623227 Upgrade Apache Tomcat to version 8.5.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5682
diff
changeset
|
63 |
$(GPATCH) $(GPATCH_FLAGS) < $(COMPONENT_DIR)/$(PATCH_DIR)/ECJ.ecj-patch; \ |
4248
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
64 |
$(CP) META-INF/MANIFEST.MF scripts/binary/META-INF/; \ |
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
65 |
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
|
66 |
|
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
67 |
# Create configuration backup archive for custom user's deployments. |
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
68 |
COMPONENT_POST_BUILD_ACTION= \ |
288
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
69 |
(cd $(PROTO_DIR) ; $(RM) conf/CONF.tar.gz ; \ |
2a474229e9a1
7002141 Problem with utility/apache
Petr Sumbera <petr.sumbera@oracle.com>
parents:
142
diff
changeset
|
70 |
gtar cfz conf/CONF.tar.gz conf/* ) |
142
6f1cb90a0ef3
7026996 move tomcat to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
71 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
72 |
# Used by this Makefile |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5506
diff
changeset
|
73 |
REQUIRED_PACKAGES += archiver/gnu-tar |
4339
6501cf9c29f9
21116842 add system-test targets to each component Makefile and to top-level Makefiles
Stacy Yeh <stacy.yeh@oracle.com>
parents:
4248
diff
changeset
|
74 |
|
4248
7b59b5b80fb0
PSARC/2015/209 Tomcat 8 integration
Petr Sumbera <petr.sumbera@oracle.com>
parents:
4151
diff
changeset
|
75 |
REQUIRED_PACKAGES += developer/java/junit |
3959
0de894549bd0
20708433 userland should build with java 8
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
3817
diff
changeset
|
76 |
REQUIRED_PACKAGES += runtime/java/jre-8 |
3817
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
2164
diff
changeset
|
77 |
REQUIRED_PACKAGES += shell/ksh93 |
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
2164
diff
changeset
|
78 |
REQUIRED_PACKAGES += system/core-os |
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
2164
diff
changeset
|
79 |
REQUIRED_PACKAGES += system/network |