Mercurial > hg > graal-compiler

comparison make/bsd/makefiles/sa.make @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents f08d439fab8c
children 8657ec177a14
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
36 36
37 TOPDIR = $(shell echo `pwd`) 37 TOPDIR = $(shell echo `pwd`)
38 GENERATED = $(TOPDIR)/../generated 38 GENERATED = $(TOPDIR)/../generated
39 39
40 # tools.jar is needed by the JDI - SA binding 40 # tools.jar is needed by the JDI - SA binding
41 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar 41 ifeq ($(SA_APPLE_BOOT_JAVA),true)
42 SA_CLASSPATH = $(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
43 else
44 SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
45 endif
42 46
43 # TODO: if it's a modules image, check if SA module is installed. 47 # TODO: if it's a modules image, check if SA module is installed.
44 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules 48 MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
45 49
46 # gnumake 3.78.1 does not accept the *s that 50 AGENT_FILES_LIST := $(GENERATED)/agent.classes.list
47 # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
48 AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
49 AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
50
51 AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
52 AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
53 51
54 SA_CLASSDIR = $(GENERATED)/saclasses 52 SA_CLASSDIR = $(GENERATED)/saclasses
55 53
56 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" 54 SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
57 55
66 -a "$(SRCARCH)" != "ppc" \ 64 -a "$(SRCARCH)" != "ppc" \
67 -a "$(SRCARCH)" != "zero" ] ; then \ 65 -a "$(SRCARCH)" != "zero" ] ; then \
68 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ 66 $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
69 fi 67 fi
70 68
71 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) 69 $(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
72 $(QUIETLY) echo "Making $@" 70 $(QUIETLY) echo "Making $@"
73 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ 71 $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
74 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ 72 echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
75 exit 1; \ 73 exit 1; \
76 fi 74 fi
80 exit 1; \ 78 exit 1; \
81 fi 79 fi
82 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \ 80 $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
83 mkdir -p $(SA_CLASSDIR); \ 81 mkdir -p $(SA_CLASSDIR); \
84 fi 82 fi
85
86 # Note: When indented, make tries to execute the '$(shell' comment. 83 # Note: When indented, make tries to execute the '$(shell' comment.
87 # In some environments, cmd processors have limited line length. 84 # In some environments, cmd processors have limited line length.
88 # To prevent the javac invocation in the next block from using 85 # To prevent the javac invocation in the next block from using
89 # a very long cmd line, we use javac's @file-list option. We 86 # a very long cmd line, we use javac's @file-list option. We
90 # generate the file lists using make's built-in 'foreach' control 87 # generate the file lists using make's built-in 'foreach' control
91 # flow which also avoids cmd processor line length issues. Since 88 # flow which also avoids cmd processor line length issues. Since
92 # the 'foreach' is done as part of make's macro expansion phase, 89 # the 'foreach' is done as part of make's macro expansion phase,
93 # the initialization of the lists is also done in the same phase 90 # the initialization of the lists is also done in the same phase
94 # using '$(shell rm ...' instead of using the more traditional 91 # using '$(shell rm ...' instead of using the more traditional
95 # 'rm ...' rule. 92 # 'rm ...' rule.
96 $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)) 93 $(shell rm -rf $(AGENT_FILES_LIST))
97 $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) 94 # gnumake 3.78.1 does not accept the *'s that
98 $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) 95 # are in AGENT_FILES, so use the shell to expand them.
99 96 # Be extra carefull to not produce too long command lines in the shell!
100 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) 97 $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
101 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) 98 $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
102
103 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer 99 $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
104 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) 100 $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
105 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js 101 $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
106 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql 102 $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
107 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources 103 $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
116 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext 112 $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
117 113
118 clean: 114 clean:
119 rm -rf $(SA_CLASSDIR) 115 rm -rf $(SA_CLASSDIR)
120 rm -rf $(GENERATED)/sa-jdi.jar 116 rm -rf $(GENERATED)/sa-jdi.jar
121 rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) 117 rm -rf $(AGENT_FILES_LIST)