Mercurial > jdk8-mips64-public > hotspot / changeset

changeset

6731958: Include all the SA classes into sa-jdi.jar

Wed, 27 Aug 2008 22:45:38 -0700

author
poonam
date
Wed, 27 Aug 2008 22:45:38 -0700
changeset 746
25c3145237c6
parent 732
f8068895c22d
child 747
9223f5bb0bf7

6731958: Include all the SA classes into sa-jdi.jar
Summary: sa-jdi.jar bundled with JDK should include all the SA classes.
Reviewed-by: swamyv

agent/make/build-pkglist file | annotate | diff | comparison | revisions
make/linux/makefiles/sa.make file | annotate | diff | comparison | revisions
make/sa.files file | annotate | diff | comparison | revisions
make/solaris/makefiles/sa.make file | annotate | diff | comparison | revisions
make/windows/makefiles/sa.make file | annotate | diff | comparison | revisions 
     1.1 --- a/agent/make/build-pkglist	Thu Aug 21 05:49:06 2008 -0700
     1.2 +++ b/agent/make/build-pkglist	Wed Aug 27 22:45:38 2008 -0700
     1.3 @@ -8,4 +8,4 @@
     1.4  SED=$MKS_HOME/sed
     1.5  SORT=$MKS_HOME/sort
     1.6  
     1.7 -$CD ../src/share/classes; $FIND sun/jvm/hotspot \( -name SCCS -prune \) -o -type d -print | $SED -e 's/\//./g' | $SORT > ../../../make/pkglist.txt
     1.8 +$CD ../src/share/classes; $FIND sun/jvm/hotspot com/sun/java/swing -type d -print | $SED -e 's/\//./g' | $SORT > ../../../make/pkglist.txt

     2.1 --- a/make/linux/makefiles/sa.make	Thu Aug 21 05:49:06 2008 -0700
     2.2 +++ b/make/linux/makefiles/sa.make	Wed Aug 27 22:45:38 2008 -0700
     2.3 @@ -41,8 +41,9 @@
     2.4  SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
     2.5  
     2.6  # gnumake 3.78.1 does not accept the *s that
     2.7 -# are in AGENT_ALLFILES, so use the shell to expand them
     2.8 -AGENT_ALLFILES := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
     2.9 +# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
    2.10 +AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
    2.11 +AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
    2.12  
    2.13  SA_CLASSDIR = $(GENERATED)/saclasses
    2.14  
    2.15 @@ -58,7 +59,7 @@
    2.16  	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
    2.17  	fi
    2.18  
    2.19 -$(GENERATED)/sa-jdi.jar: $(AGENT_ALLFILES)
    2.20 +$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
    2.21  	$(QUIETLY) echo "Making $@"
    2.22  	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
    2.23  	  echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
    2.24 @@ -72,9 +73,18 @@
    2.25  	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
    2.26  	  mkdir -p $(SA_CLASSDIR);        \
    2.27  	fi
    2.28 -	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
    2.29 +
    2.30 +	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
    2.31 +	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
    2.32 +
    2.33  	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
    2.34  	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
    2.35 +	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
    2.36 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
    2.37 +	$(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
    2.38 +	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/*
    2.39 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/
    2.40 +	$(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
    2.41  	$(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
    2.42  	$(QUIETLY) $(REMOTE) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
    2.43  	$(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext

     3.1 --- a/make/sa.files	Thu Aug 21 05:49:06 2008 -0700
     3.2 +++ b/make/sa.files	Wed Aug 27 22:45:38 2008 -0700
     3.3 @@ -33,40 +33,23 @@
     3.4  
     3.5  AGENT_SRC_DIR = $(AGENT_DIR)/src/share/classes
     3.6  
     3.7 -AGENT_ALLFILES = \
     3.8 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/DebugServer.java \
     3.9 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/HelloWorld.java \
    3.10 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/HotSpotAgent.java \
    3.11 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java \
    3.12 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/HotSpotTypeDataBase.java \
    3.13 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/LinuxVtblAccess.java \
    3.14 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/ObjectHistogram.java \
    3.15 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/RMIHelper.java \
    3.16 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/StackTrace.java \
    3.17 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/TestDebugger.java \
    3.18 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/Win32VtblAccess.java \
    3.19 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/Immediate.java \
    3.20 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/ImmediateOrRegister.java \
    3.21 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/Operand.java \
    3.22 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/Register.java \
    3.23 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/amd64/AMD64Register.java \
    3.24 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/amd64/AMD64Registers.java \
    3.25 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/ia64/IA64Register.java \
    3.26 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/ia64/IA64Registers.java \
    3.27 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/sparc/SPARCArgument.java \
    3.28 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/sparc/SPARCRegister.java \
    3.29 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java \
    3.30 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/sparc/SPARCRegisters.java \
    3.31 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/X86Register.java \
    3.32 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/X86RegisterPart.java \
    3.33 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/X86Registers.java \
    3.34 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/X86SegmentRegister.java \
    3.35 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/X86SegmentRegisters.java \
    3.36 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/BugSpotAgent.java \
    3.37 +# Splitted the set of files into two sets because on linux plaform
    3.38 +# listing or compiling all the files results in 'Argument list too long' error.
    3.39 +
    3.40 +AGENT_FILES1 = \
    3.41 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/*.java \
    3.42 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/*.java \
    3.43 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/amd64/*.java \
    3.44 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/ia64/*.java \
    3.45 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/sparc/*.java \
    3.46 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/*.java \
    3.47 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/*.java \
    3.48 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/tree/*.java \
    3.49  $(AGENT_SRC_DIR)/sun/jvm/hotspot/c1/*.java \
    3.50  $(AGENT_SRC_DIR)/sun/jvm/hotspot/code/*.java \
    3.51  $(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
    3.52  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \
    3.53 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
    3.54  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/*.java \
    3.55  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/basic/*.java \
    3.56  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/basic/x86/*.java \
    3.57 @@ -75,7 +58,6 @@
    3.58  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/sparc/*.java \
    3.59  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/x86/*.java \
    3.60  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dummy/*.java \
    3.61 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
    3.62  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/ia64/*.java \
    3.63  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/*.java \
    3.64  $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/amd64/*.java \
    3.65 @@ -107,7 +89,10 @@
    3.66  $(AGENT_SRC_DIR)/sun/jvm/hotspot/jdi/*.java \
    3.67  $(AGENT_SRC_DIR)/sun/jvm/hotspot/livejvm/*.java \
    3.68  $(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/*.java \
    3.69 -$(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java \
    3.70 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java 
    3.71 +
    3.72 +
    3.73 +AGENT_FILES2 = \
    3.74  $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/*.java \
    3.75  $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/amd64/*.java \
    3.76  $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
    3.77 @@ -127,7 +112,17 @@
    3.78  $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/x86/*.java \
    3.79  $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \
    3.80  $(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \
    3.81 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/soql/*.java \
    3.82  $(AGENT_SRC_DIR)/sun/jvm/hotspot/types/*.java \
    3.83  $(AGENT_SRC_DIR)/sun/jvm/hotspot/types/basic/*.java \
    3.84  $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/*.java \
    3.85  $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/memo/*.java \
    3.86 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/*.java \
    3.87 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/*.java \
    3.88 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/action/*.java \
    3.89 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/classbrowser/*.java \
    3.90 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/table/*.java \
    3.91 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/tree/*.java \
    3.92 +$(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/treetable/*.java \
    3.93 +$(AGENT_SRC_DIR)/com/sun/java/swing/action/*.java \
    3.94 +$(AGENT_SRC_DIR)/com/sun/java/swing/ui/*.java

     4.1 --- a/make/solaris/makefiles/sa.make	Thu Aug 21 05:49:06 2008 -0700
     4.2 +++ b/make/solaris/makefiles/sa.make	Wed Aug 27 22:45:38 2008 -0700
     4.3 @@ -37,8 +37,9 @@
     4.4  SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
     4.5  
     4.6  # gnumake 3.78.1 does not accept the *s that
     4.7 -# are in AGENT_ALLFILES, so use the shell to expand them
     4.8 -AGENT_ALLFILES := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
     4.9 +# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
    4.10 +AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
    4.11 +AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
    4.12  
    4.13  SA_CLASSDIR = $(GENERATED)/saclasses
    4.14  
    4.15 @@ -52,7 +53,7 @@
    4.16  	   $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
    4.17  	fi
    4.18  
    4.19 -$(GENERATED)/sa-jdi.jar: $(AGENT_ALLFILES)
    4.20 +$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
    4.21  	$(QUIETLY) echo "Making $@";
    4.22  	$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
    4.23  	   echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
    4.24 @@ -66,9 +67,17 @@
    4.25  	$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
    4.26  	  mkdir -p $(SA_CLASSDIR);        \
    4.27  	fi
    4.28 -	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
    4.29 +	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
    4.30 +	$(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
    4.31 +	
    4.32  	$(QUIETLY) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
    4.33  	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
    4.34 +	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
    4.35 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
    4.36 +	$(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
    4.37 +	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/*
    4.38 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/
    4.39 +	$(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
    4.40  	$(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
    4.41  	$(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
    4.42  	$(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal

     5.1 --- a/make/windows/makefiles/sa.make	Thu Aug 21 05:49:06 2008 -0700
     5.2 +++ b/make/windows/makefiles/sa.make	Wed Aug 27 22:45:38 2008 -0700
     5.3 @@ -49,15 +49,22 @@
     5.4  
     5.5  default::  $(GENERATED)\sa-jdi.jar
     5.6  
     5.7 -$(GENERATED)\sa-jdi.jar: $(AGENT_ALLFILES:/=\) 
     5.8 +$(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
     5.9  	@if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
    5.10  	@echo ...Building sa-jdi.jar
    5.11  	@echo ...$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) ....
    5.12 -	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES:/=\)
    5.13 +	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
    5.14 +	@$(COMPILE_JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
    5.15  	$(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
    5.16  	$(QUIETLY) echo $(SA_BUILD_VERSION_PROP) > $(SA_PROPERTIES)
    5.17  	$(RUN_JAR) cf $@ -C saclasses . 
    5.18  	$(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector 
    5.19 +	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
    5.20 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
    5.21 +	$(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
    5.22 +	$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/*
    5.23 +	$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/
    5.24 +	$(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
    5.25  	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
    5.26  	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext 
    5.27  	$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext

Mercurial Repository: jdk8-mips64-public/hotspot

mercurial