24 # |
24 # |
25 |
25 |
26 include ../../make-rules/shared-macros.mk |
26 include ../../make-rules/shared-macros.mk |
27 |
27 |
28 COMPONENT_NAME= tomcat |
28 COMPONENT_NAME= tomcat |
29 COMPONENT_VERSION= 6.0.41 |
29 COMPONENT_VERSION= 6.0.43 |
30 COMPONENT_PROJECT_URL= http://tomcat.apache.org/ |
30 COMPONENT_PROJECT_URL= http://tomcat.apache.org/ |
31 COMPONENT_SRC_NAME= apache-tomcat |
31 COMPONENT_SRC_NAME= apache-tomcat |
32 COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src |
32 COMPONENT_SRC= $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src |
33 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz |
33 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz |
34 COMPONENT_ARCHIVE_HASH= \ |
34 COMPONENT_ARCHIVE_HASH= \ |
35 sha256:6def26d6eefb168a0968400d53dc08939284570ca850a0c4740398e9b645ff3c |
35 sha256:ef32da195dc0f070c5f8d1c48b02a213cc69b680ec735f1297ef0d8ca62e75be |
36 COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) |
36 COMPONENT_ARCHIVE_URL= http://www.apache.org/dist/tomcat/tomcat-6/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE) |
37 COMPONENT_BUGDB= utility/tomcat |
37 COMPONENT_BUGDB= utility/tomcat |
38 |
38 |
39 # Tomcat subcomponents |
39 # Tomcat subcomponents |
40 COMPONENT_ARCHIVE_1= commons-dbcp-1.4-src.tar.gz |
40 COMPONENT_ARCHIVE_1= commons-dbcp-1.4-src.tar.gz |
48 COMPONENT_ARCHIVE_3= ecj-4.3.1.jar |
48 COMPONENT_ARCHIVE_3= ecj-4.3.1.jar |
49 COMPONENT_ARCHIVE_HASH_3= \ |
49 COMPONENT_ARCHIVE_HASH_3= \ |
50 sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295 |
50 sha256:5f86314f67dc57a0a9865265a48fd7831f16ab177c0c1349eea798c2c6297295 |
51 COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3) |
51 COMPONENT_ARCHIVE_URL_3= http://download.eclipse.org/eclipse/downloads/drops4/R-4.3.1-201309111000/$(COMPONENT_ARCHIVE_3) |
52 |
52 |
53 TPNO= 17997 |
53 TPNO= 20718 |
54 |
54 |
55 include $(WS_MAKE_RULES)/prep.mk |
55 include $(WS_MAKE_RULES)/prep.mk |
56 include $(WS_MAKE_RULES)/ant.mk |
56 include $(WS_MAKE_RULES)/ant.mk |
57 include $(WS_MAKE_RULES)/ips.mk |
57 include $(WS_MAKE_RULES)/ips.mk |
|
58 |
|
59 PATCH_LEVEL=0 |
58 |
60 |
59 COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR) |
61 COMPONENT_BUILD_ARGS=-Dbase.path=$(BUILD_DIR_32) -Dtomcat.build=$(PROTO_DIR) |
60 COMPONENT_BUILD_TARGETS=download deploy |
62 COMPONENT_BUILD_TARGETS=download deploy |
61 |
63 |
62 # Create configuration backup archive for custom user's deployments. |
64 # Create configuration backup archive for custom user's deployments. |
67 COMPONENT_TEST_DIR = $(@D)/test |
69 COMPONENT_TEST_DIR = $(@D)/test |
68 COMPONENT_TEST_ARGS = $(COMPONENT_BUILD_ARGS) \ |
70 COMPONENT_TEST_ARGS = $(COMPONENT_BUILD_ARGS) \ |
69 -Djunit.home=/usr/share/lib/java |
71 -Djunit.home=/usr/share/lib/java |
70 COMPONENT_TEST_TARGETS = |
72 COMPONENT_TEST_TARGETS = |
71 |
73 |
|
74 COMPONENT_TEST_TRANSFORMS += \ |
|
75 '-e "/\[java\] Time: .*/d"' \ |
|
76 '-e "/^Total time:/d"' |
|
77 |
72 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
78 ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
73 |
79 |
74 build: $(BUILD_32) |
80 build: $(BUILD_32) |
75 |
81 |
76 install: build |
82 install: build |