1.1 --- a/make/windows/makefiles/sa.make Thu Aug 02 14:54:14 2012 -0700
1.2 +++ b/make/windows/makefiles/sa.make Fri Aug 03 18:34:28 2012 -0700
1.3 @@ -36,37 +36,37 @@
1.4 !include $(WorkSpace)/make/windows/makefiles/rules.make
1.5 !include $(WorkSpace)/make/sa.files
1.6
1.7 -GENERATED = ..\generated
1.8 +GENERATED = ../generated
1.9
1.10 # tools.jar is needed by the JDI - SA binding
1.11 -SA_CLASSPATH = $(BOOT_JAVA_HOME)\lib\tools.jar
1.12 +SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
1.13
1.14 -SA_CLASSDIR = $(GENERATED)\saclasses
1.15 +SA_CLASSDIR = $(GENERATED)/saclasses
1.16
1.17 SA_BUILD_VERSION_PROP = sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)
1.18
1.19 -SA_PROPERTIES = $(SA_CLASSDIR)\sa.properties
1.20 +SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
1.21
1.22 -default:: $(GENERATED)\sa-jdi.jar
1.23 +default:: $(GENERATED)/sa-jdi.jar
1.24
1.25 # Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space
1.26 # at the end of SA version string and causes a version mismatch with the target VM version.
1.27
1.28 -$(GENERATED)\sa-jdi.jar: $(AGENT_FILES:/=\)
1.29 - @if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
1.30 - @echo ...Building sa-jdi.jar
1.31 +$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
1.32 + $(QUIETLY) mkdir -p $(SA_CLASSDIR)
1.33 + @echo ...Building sa-jdi.jar into $(SA_CLASSDIR)
1.34 @echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
1.35 - @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES:/=\)
1.36 + @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES)
1.37 $(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
1.38 $(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
1.39 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
1.40 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
1.41 $(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
1.42 - $(QUIETLY) mkdir $(SA_CLASSDIR)\sun\jvm\hotspot\ui\resources
1.43 + $(QUIETLY) mkdir $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
1.44 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
1.45 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)
1.46 $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) .
1.47 - $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector
1.48 + $(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
1.49 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
1.50 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
1.51 $(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
1.52 @@ -85,27 +85,27 @@
1.53 # will be useful to have the assertion checks in place
1.54
1.55 !if "$(BUILDARCH)" == "ia64"
1.56 -SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
1.57 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
1.58 !elseif "$(BUILDARCH)" == "amd64"
1.59 -SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
1.60 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 $(GX_OPTION) -Od -D "WIN32" -D "WIN64" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -c
1.61 !if "$(COMPILER_NAME)" == "VS2005"
1.62 # On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
1.63 # otherwise we get missing __security_check_cookie externals at link time.
1.64 SA_LD_FLAGS = bufferoverflowU.lib
1.65 !endif
1.66 !else
1.67 -SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
1.68 +SA_CFLAGS = -nologo $(MS_RUNTIME_OPTION) -W3 -Gm $(GX_OPTION) -Od -D "WIN32" -D "_WINDOWS" -D "_DEBUG" -D "_CONSOLE" -D "_MBCS" -YX -FD -GZ -c
1.69 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
1.70 -SA_CFLAGS = $(SA_CFLAGS) /ZI
1.71 +SA_CFLAGS = $(SA_CFLAGS) -ZI
1.72 !endif
1.73 !endif
1.74 !if "$(MT)" != ""
1.75 -SA_LD_FLAGS = /manifest $(SA_LD_FLAGS)
1.76 +SA_LD_FLAGS = -manifest $(SA_LD_FLAGS)
1.77 !endif
1.78 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
1.79 -SA_LFLAGS = $(SA_LD_FLAGS) /nologo /subsystem:console /machine:$(MACHINE)
1.80 +SA_LFLAGS = $(SA_LD_FLAGS) -nologo -subsystem:console -machine:$(MACHINE)
1.81 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
1.82 -SA_LFLAGS = $(SA_LFLAGS) /map /debug
1.83 +SA_LFLAGS = $(SA_LFLAGS) -map -debug
1.84 !endif
1.85
1.86 # Note that we do not keep sawindbj.obj around as it would then
1.87 @@ -117,15 +117,15 @@
1.88 $(SAWINDBG): $(SASRCFILE)
1.89 set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
1.90 $(CXX) @<<
1.91 - /I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32"
1.92 - /I"$(GENERATED)" $(SA_CFLAGS)
1.93 + -I"$(BootStrapDir)/include" -I"$(BootStrapDir)/include/win32"
1.94 + -I"$(GENERATED)" $(SA_CFLAGS)
1.95 $(SASRCFILE)
1.96 - /out:$*.obj
1.97 + -out:$*.obj
1.98 <<
1.99 set LIB=$(SA_LIB)$(LIB)
1.100 - $(LD) /out:$@ /DLL $*.obj dbgeng.lib $(SA_LFLAGS)
1.101 + $(LD) -out:$@ -DLL $*.obj dbgeng.lib $(SA_LFLAGS)
1.102 !if "$(MT)" != ""
1.103 - $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2
1.104 + $(MT) -manifest $(@F).manifest -outputresource:$(@F);#2
1.105 !endif
1.106 !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1"
1.107 !if "$(ZIP_DEBUGINFO_FILES)" == "1"
1.108 @@ -136,6 +136,6 @@
1.109 -@rm -f $*.obj
1.110
1.111 cleanall :
1.112 - rm -rf $(GENERATED:\=/)/saclasses
1.113 - rm -rf $(GENERATED:\=/)/sa-jdi.jar
1.114 + rm -rf $(GENERATED)/saclasses
1.115 + rm -rf $(GENERATED)/sa-jdi.jar
1.116 !endif
