Mercurial > hg > graal-compiler

comparison make/solaris/makefiles/sa.make @ 1804:2966dab85b3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time Summary: Refine fix for 6561870 to only rebuild sa-jdi.jar when needed Reviewed-by: never, ohair, coleenp
author dcubed
date Tue, 21 Sep 2010 06:58:44 -0700
parents ea175c1b79ce
children 37be97a58393
comparison
equal deleted inserted replaced
1803:60f88489896f 1804:2966dab85b3e
57 all: 57 all:
58 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \ 58 $(QUIETLY) if [ -d $(AGENT_DIR) ] ; then \
59 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 59 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
60 fi 60 fi
61 61
62 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean 62 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
63 $(QUIETLY) echo "Making $@"; 63 $(QUIETLY) echo "Making $@";
64 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 64 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
65 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 65 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
66 exit 1; \ 66 exit 1; \
67 fi 67 fi
72 fi 72 fi
73 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 73 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
74 mkdir -p $(SA_CLASSDIR); \ 74 mkdir -p $(SA_CLASSDIR); \
75 fi 75 fi
76 76
77 # Note: When indented, make tries to execute the '$(shell' comment.
78 # In some environments, cmd processors have limited line length.
79 # To prevent the javac invocation in the next block from using
80 # a very long cmd line, we use javac's @file-list option. We
81 # generate the file lists using make's built-in 'foreach' control
82 # flow which also avoids cmd processor line length issues. Since
83 # the 'foreach' is done as part of make's macro expansion phase,
84 # the initialization of the lists is also done in the same phase
85 # using '$(shell rm ...' instead of using the more traditional
86 # 'rm ...' rule.
87 $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
77 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) 88 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
78 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) 89 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
79 90
80 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) 91 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
81 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) 92 $(QUIETLY) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
90 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/ 101 $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
91 $(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ . 102 $(QUIETLY) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
92 $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector 103 $(QUIETLY) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
93 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal 104 $(QUIETLY) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.proc.ProcDebuggerLocal
94 105
95 agent_files_preclean:
96 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
97
98 clean: 106 clean:
99 rm -rf $(SA_CLASSDIR) 107 rm -rf $(SA_CLASSDIR)
100 rm -rf $(GENERATED)/sa-jdi.jar 108 rm -rf $(GENERATED)/sa-jdi.jar
101 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) 109 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)