Print this page


Split Close
Expand all
Collapse all
          --- old/make/linux/makefiles/sa.make
          +++ new/make/linux/makefiles/sa.make
↓ open down ↓ 60 lines elided ↑ open up ↑
  61   61  # also, we don't build SA on Itanium, PowerPC, ARM or zero.
  62   62  
  63   63  all: 
  64   64          if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
  65   65               -a "$(SRCARCH)" != "arm" \
  66   66               -a "$(SRCARCH)" != "ppc" \
  67   67               -a "$(SRCARCH)" != "zero" ] ; then \
  68   68             $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
  69   69          fi
  70   70  
  71      -$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean
       71 +$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
  72   72          $(QUIETLY) echo "Making $@"
  73   73          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
  74   74            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
  75   75            exit 1; \
  76   76          fi
  77   77          $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
  78   78            echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
  79   79            echo ""; \
  80   80            exit 1; \
  81   81          fi
  82   82          $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
  83   83            mkdir -p $(SA_CLASSDIR);        \
  84   84          fi
  85   85          
       86 +        # The file lists are generated when make does variable expansion
       87 +        # in preparation for executing the rules for this target; javac
       88 +        # uses the file lists in the next block during rule execution.
       89 +        $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
  86   90          $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
  87   91          $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
  88   92          
  89   93          $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
  90   94          $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
  91   95          
  92   96          $(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
  93   97          $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
  94   98          $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
  95   99          $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
↓ open down ↓ 1 lines elided ↑ open up ↑
  97  101          $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/*
  98  102          $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/
  99  103          $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
 100  104          $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
 101  105          $(QUIETLY) $(REMOTE) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
 102  106          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
 103  107          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
 104  108          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
 105  109          $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
 106  110  
 107      -agent_files_preclean:
 108      -        rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
 109      -
 110  111  clean:
 111  112          rm -rf $(SA_CLASSDIR)
 112  113          rm -rf $(GENERATED)/sa-jdi.jar
 113  114          rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX