Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/windows/build.make	Wed Nov 26 09:24:57 2008 -0800
     1.2 +++ b/make/windows/build.make	Thu Nov 27 18:19:23 2008 -0800
     1.3 @@ -200,29 +200,6 @@
     1.4  checkSA::
     1.5  	@echo     Not building SA:  ARCH = ia64
     1.6  
     1.7 -!elseif exist("$(MSVCDIR)\PlatformSDK\Include\dbgeng.h")
     1.8 -# These don't have to be set because the default
     1.9 -# setting of INCLUDE and LIB already contain the needed dirs.
    1.10 -SA_INCLUDE = 
    1.11 -SA_LIB = 
    1.12 -
    1.13 -!elseif exist("$(SYSTEMROOT)\..\Program Files\Microsoft SDK\include\dbgeng.h")
    1.14 -# These don't have to be set because the default
    1.15 -# setting of INCLUDE and LIB already contain the needed dirs.
    1.16 -SA_INCLUDE =
    1.17 -SA_LIB = 
    1.18 -
    1.19 -!else
    1.20 -checkSA::
    1.21 -	@echo .
    1.22 -	@echo ERROR:  Can't build SA because dbgeng.h does not exist here:
    1.23 -	@echo     $(MSVCDIR)\PlatformSDK\Include\dbgeng.h
    1.24 -	@echo nor here:
    1.25 -	@echo     $(SYSTEMROOT)\..\Program Files\Microsoft SDK\include\dbgeng.h
    1.26 -	@echo You must use Vis. Studio .Net 2003 on Win 32, and you must
    1.27 -	@echo have the Microsoft SDK installed on Win amd64.
    1.28 -	@echo You can disable building of SA by specifying BUILD_WIN_SA = 0
    1.29 -	@echo . && false
    1.30  !endif  # ! "$(BUILD_WIN_SA)" != "1"
    1.31  
    1.32  #########################################################################

     2.1 --- a/make/windows/makefiles/defs.make	Wed Nov 26 09:24:57 2008 -0800
     2.2 +++ b/make/windows/makefiles/defs.make	Thu Nov 27 18:19:23 2008 -0800
     2.3 @@ -119,7 +119,7 @@
     2.4  # we want to release it.  If we build it here,
     2.5  # the SDK makefiles will copy it over and put it into
     2.6  # the created image.
     2.7 -BUILD_WIN_SA = 0
     2.8 +BUILD_WIN_SA = 1
     2.9  ifneq ($(ALT_BUILD_WIN_SA),)
    2.10    BUILD_WIN_SA = $(ALT_BUILD_WIN_SA)
    2.11  endif

     3.1 --- a/make/windows/makefiles/sa.make	Wed Nov 26 09:24:57 2008 -0800
     3.2 +++ b/make/windows/makefiles/sa.make	Thu Nov 27 18:19:23 2008 -0800
     3.3 @@ -49,6 +49,9 @@
     3.4  
     3.5  default::  $(GENERATED)\sa-jdi.jar
     3.6  
     3.7 +# Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space
     3.8 +# at the end of SA version string and causes a version mismatch with the target VM version.
     3.9 +
    3.10  $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
    3.11  	@if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
    3.12  	@echo ...Building sa-jdi.jar
    3.13 @@ -56,15 +59,15 @@
    3.14  	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
    3.15  	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
    3.16  	$(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
    3.17 -	$(QUIETLY) echo $(SA_BUILD_VERSION_PROP) > $(SA_PROPERTIES)
    3.18 -	$(RUN_JAR) cf $@ -C saclasses . 
    3.19 -	$(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector 
    3.20 +	$(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
    3.21  	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
    3.22  	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
    3.23 -	$(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
    3.24 -	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/*
    3.25 -	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/
    3.26 -	$(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
    3.27 +	$(QUIETLY) rm -rf $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
    3.28 +	$(QUIETLY) mkdir $(SA_CLASSDIR)\sun\jvm\hotspot\ui\resources
    3.29 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
    3.30 +	$(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)
    3.31 +	$(RUN_JAR) cf $@ -C saclasses .
    3.32 +	$(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector
    3.33  	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
    3.34  	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext 
    3.35  	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext 
    3.36 @@ -93,7 +96,7 @@
    3.37  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
    3.38  !endif
    3.39  !if "$(MT)" != ""
    3.40 -    SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS)
    3.41 +SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS)
    3.42  !endif
    3.43  SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
    3.44  SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE)