equal
deleted
inserted
replaced
22 # |
22 # |
23 # |
23 # |
24 |
24 |
25 # This makefile (sa.make) is included from the sa.make in the |
25 # This makefile (sa.make) is included from the sa.make in the |
26 # build directories. |
26 # build directories. |
|
27 |
|
28 define print_info |
|
29 ifneq ($$(LOG_LEVEL), warn) |
|
30 $$(shell echo >&2 "INFO: $1") |
|
31 endif |
|
32 endef |
27 |
33 |
28 # This makefile is used to build Serviceability Agent java code |
34 # This makefile is used to build Serviceability Agent java code |
29 # and generate JNI header file for native methods. |
35 # and generate JNI header file for native methods. |
30 |
36 |
31 include $(GAMMADIR)/make/bsd/makefiles/rules.make |
37 include $(GAMMADIR)/make/bsd/makefiles/rules.make |
51 APPLE_JAR=$(BOOT_JAVA_HOME)/bundle/Classes/classes.jar |
57 APPLE_JAR=$(BOOT_JAVA_HOME)/bundle/Classes/classes.jar |
52 SA_CLASSPATH=$(shell test -f $(APPLE_JAR) && echo $(APPLE_JAR)) |
58 SA_CLASSPATH=$(shell test -f $(APPLE_JAR) && echo $(APPLE_JAR)) |
53 endif |
59 endif |
54 endif |
60 endif |
55 else |
61 else |
56 _JUNK_ := $(shell echo >&2 "INFO: ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)") |
62 $(eval $(call print_info, "ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")) |
57 SA_CLASSPATH=$(shell test -f $(ALT_SA_CLASSPATH) && echo $(ALT_SA_CLASSPATH)) |
63 SA_CLASSPATH=$(shell test -f $(ALT_SA_CLASSPATH) && echo $(ALT_SA_CLASSPATH)) |
58 endif |
64 endif |
59 |
65 |
60 # TODO: if it's a modules image, check if SA module is installed. |
66 # TODO: if it's a modules image, check if SA module is installed. |
61 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules |
67 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules |
78 -a "$(SRCARCH)" != "zero" ] ; then \ |
84 -a "$(SRCARCH)" != "zero" ] ; then \ |
79 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ |
85 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ |
80 fi |
86 fi |
81 |
87 |
82 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES) |
88 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES) |
83 $(QUIETLY) echo "Making $@" |
89 $(QUIETLY) echo $(LOG_INFO) "Making $@" |
84 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ |
90 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ |
85 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ |
91 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ |
86 exit 1; \ |
92 exit 1; \ |
87 fi |
93 fi |
88 $(QUIETLY) if [ ! -f "$(SA_CLASSPATH)" -a ! -d $(MODULELIB_PATH) ] ; then \ |
94 $(QUIETLY) if [ ! -f "$(SA_CLASSPATH)" -a ! -d $(MODULELIB_PATH) ] ; then \ |