61 else |
61 else |
62 $(eval $(call print_info, "ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")) |
62 $(eval $(call print_info, "ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")) |
63 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)) |
64 endif |
64 endif |
65 |
65 |
|
66 ifneq ($(SA_CLASSPATH),) |
|
67 SA_CLASSPATH_ARG := -classpath $(SA_CLASSPATH) |
|
68 endif |
|
69 |
66 # TODO: if it's a modules image, check if SA module is installed. |
70 # TODO: if it's a modules image, check if SA module is installed. |
67 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules |
71 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules |
68 |
72 |
69 AGENT_FILES_LIST := $(GENERATED)/agent.classes.list |
73 AGENT_FILES_LIST := $(GENERATED)/agent.classes.list |
70 |
74 |
112 $(shell rm -rf $(AGENT_FILES_LIST)) |
116 $(shell rm -rf $(AGENT_FILES_LIST)) |
113 # gnumake 3.78.1 does not accept the *'s that |
117 # gnumake 3.78.1 does not accept the *'s that |
114 # are in AGENT_FILES, so use the shell to expand them. |
118 # are in AGENT_FILES, so use the shell to expand them. |
115 # Be extra carefull to not produce too long command lines in the shell! |
119 # Be extra carefull to not produce too long command lines in the shell! |
116 $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) |
120 $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST))) |
117 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) |
121 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) $(SA_CLASSPATH_ARG) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST) |
118 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
122 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
119 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) |
123 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) |
120 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
124 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
121 $(QUIETLY) $(CP) $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql |
125 $(QUIETLY) $(CP) $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql |
122 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
126 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |