make/linux/makefiles/sa.make

*** 1,7 ****
  #
! # Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 46,55 ****
--- 46,58 ----
  # gnumake 3.78.1 does not accept the *s that
  # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
  AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
  AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
  
+ AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
+ AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
+ 
  SA_CLASSDIR = $(GENERATED)/saclasses
  
  SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
  
  SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
*** 63,73 ****
               -a "$(SRCARCH)" != "ppc" \
               -a "$(SRCARCH)" != "zero" ] ; then \
             $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
          fi
  
! $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
          $(QUIETLY) echo "Making $@"
          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
            exit 1; \
          fi
--- 66,76 ----
               -a "$(SRCARCH)" != "ppc" \
               -a "$(SRCARCH)" != "zero" ] ; then \
             $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
          fi
  
! $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
          $(QUIETLY) echo "Making $@"
          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
            exit 1; \
          fi
*** 78,90 ****
          fi
          $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
            mkdir -p $(SA_CLASSDIR);        \
          fi
  
!         $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1)
!         $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2)
  
          $(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
          $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
          $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
          $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
          $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
--- 81,96 ----
          fi
          $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
            mkdir -p $(SA_CLASSDIR);        \
          fi
          
!         $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
!         $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
          
+         $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
+         $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
+         
          $(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
          $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
          $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
          $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
          $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
*** 96,103 ****
--- 102,113 ----
          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
  
+ agent_files_preclean:
+         rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
+ 
  clean:
          rm -rf $(SA_CLASSDIR)
          rm -rf $(GENERATED)/sa-jdi.jar
+         rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)