Mercurial > hg > truffle
comparison make/windows/makefiles/sa.make @ 456:b6272ef4a18f
6743339: Enable building sa-jdi.jar and sawindbg.dll on Windows with hotspot build
Summary: These changes enable the SA binaries build with hotspot build on Windows
Reviewed-by: swamyv
author | poonam |
---|---|
date | Thu, 27 Nov 2008 18:19:23 -0800 |
parents | 3c07cda72b7d |
children | c3a720eefe82 |
comparison
equal
deleted
inserted
replaced
455:434912c745cf | 456:b6272ef4a18f |
---|---|
47 | 47 |
48 SA_PROPERTIES = $(SA_CLASSDIR)\sa.properties | 48 SA_PROPERTIES = $(SA_CLASSDIR)\sa.properties |
49 | 49 |
50 default:: $(GENERATED)\sa-jdi.jar | 50 default:: $(GENERATED)\sa-jdi.jar |
51 | 51 |
52 # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space | |
53 # at the end of SA version string and causes a version mismatch with the target VM version. | |
54 | |
52 $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\) | 55 $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\) |
53 @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR) | 56 @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR) |
54 @echo ...Building sa-jdi.jar | 57 @echo ...Building sa-jdi.jar |
55 @echo ...$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) .... | 58 @echo ...$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) .... |
56 @$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) | 59 @$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\) |
57 @$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) | 60 @$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\) |
58 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer | 61 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer |
59 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP) > $(SA_PROPERTIES) | 62 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES) |
60 $(RUN_JAR) cf $@ -C saclasses . | |
61 $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector | |
62 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js | 63 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js |
63 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql | 64 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql |
64 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources | 65 $(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
65 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/* | 66 $(QUIETLY) mkdir $(SA_CLASSDIR)\sun\jvm\hotspot\ui\resources |
66 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/ | 67 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources |
67 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/ | 68 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR) |
69 $(RUN_JAR) cf $@ -C saclasses . | |
70 $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector | |
68 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal | 71 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal |
69 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext | 72 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext |
70 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext | 73 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext |
71 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext | 74 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext |
72 | 75 |
91 SA_LINK_FLAGS = bufferoverflowU.lib | 94 SA_LINK_FLAGS = bufferoverflowU.lib |
92 !else | 95 !else |
93 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c | 96 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c |
94 !endif | 97 !endif |
95 !if "$(MT)" != "" | 98 !if "$(MT)" != "" |
96 SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS) | 99 SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS) |
97 !endif | 100 !endif |
98 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp | 101 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp |
99 SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE) | 102 SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE) |
100 | 103 |
101 # Note that we do not keep sawindbj.obj around as it would then | 104 # Note that we do not keep sawindbj.obj around as it would then |