equal
deleted
inserted
replaced
16 # fields enclosed by brackets "[]" replaced with your own identifying |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
21 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
22 # |
22 # |
23 include ../../make-rules/shared-macros.mk |
23 include ../../make-rules/shared-macros.mk |
24 |
24 |
25 COMPONENT_NAME= junit |
25 COMPONENT_NAME= junit |
26 COMPONENT_VERSION= 4.10 |
26 COMPONENT_VERSION= 4.10 |
34 |
34 |
35 include ../../make-rules/prep.mk |
35 include ../../make-rules/prep.mk |
36 include ../../make-rules/ant.mk |
36 include ../../make-rules/ant.mk |
37 include ../../make-rules/ips.mk |
37 include ../../make-rules/ips.mk |
38 |
38 |
|
39 JAVA_HOME=$(JAVA6_HOME) |
|
40 |
39 COMPONENT_BUILD_ARGS += -Ddist=${PROTO_DIR} |
41 COMPONENT_BUILD_ARGS += -Ddist=${PROTO_DIR} |
40 COMPONENT_BUILD_ARGS += -Djavadocdir=${PROTO_DIR} |
42 COMPONENT_BUILD_ARGS += -Djavadocdir=${PROTO_DIR} |
41 COMPONENT_BUILD_TARGETS += dist |
43 COMPONENT_BUILD_TARGETS += dist |
42 |
44 |
43 # common targets |
45 # common targets |