comparison make/Makefile @ 3547:44da449fc29c

Update linux makefiles to create a graal VM, make a few run* +x
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Wed, 17 Aug 2011 11:58:19 +0200
parents 2ab52cda08e5
children 04b9a2566eec
comparison
equal deleted inserted replaced
3546:4aa80ca3dbec 3547:44da449fc29c
86 C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1 86 C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
87 C2_VM_TARGETS=product fastdebug optimized jvmg 87 C2_VM_TARGETS=product fastdebug optimized jvmg
88 KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel 88 KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
89 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero 89 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
90 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark 90 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
91 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal jvmggraal
91 92
92 # JDK directory list 93 # JDK directory list
93 JDK_DIRS=bin include jre lib demo 94 JDK_DIRS=bin include jre lib demo
94 95
95 all: all_product all_fastdebug 96 all: all_product all_fastdebug
114 all_productshark: productshark docs export_product 115 all_productshark: productshark docs export_product
115 all_fastdebugshark: fastdebugshark docs export_fastdebug 116 all_fastdebugshark: fastdebugshark docs export_fastdebug
116 all_debugshark: jvmgshark docs export_debug 117 all_debugshark: jvmgshark docs export_debug
117 all_optimizedshark: optimizedshark docs export_optimized 118 all_optimizedshark: optimizedshark docs export_optimized
118 119
120 allgraal: all_productgraal all_fastdebuggraal
121 all_productgraal: productgraal docs export_product
122 all_fastdebuggraal: fastdebuggraal docs export_fastdebug
123 all_debuggraal: jvmggraal docs export_debug
124 all_optimizedgraal: optimizedgraal docs export_optimized
125
119 # Do everything 126 # Do everything
120 world: all create_jdk 127 world: all create_jdk
121 128
122 # Build or export docs 129 # Build or export docs
123 docs: 130 docs:
147 $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT) 154 $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT)
148 155
149 $(SHARK_VM_TARGETS): 156 $(SHARK_VM_TARGETS):
150 $(CD) $(GAMMADIR)/make; \ 157 $(CD) $(GAMMADIR)/make; \
151 $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT) 158 $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT)
159
160 $(GRAAL_VM_TARGETS):
161 $(CD) $(GAMMADIR)/make; \
162 $(MAKE) VM_TARGET=$@ generic_buildgraal $(ALT_OUT)
152 163
153 # Build compiler1 (client) rule, different for platforms 164 # Build compiler1 (client) rule, different for platforms
154 generic_build1: 165 generic_build1:
155 $(MKDIR) -p $(OUTPUTDIR) 166 $(MKDIR) -p $(OUTPUTDIR)
156 ifeq ($(OSNAME),windows) 167 ifeq ($(OSNAME),windows)
211 $(CD) $(OUTPUTDIR); \ 222 $(CD) $(OUTPUTDIR); \
212 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 223 $(MAKE) -f $(ABS_OS_MAKEFILE) \
213 $(MAKE_ARGS) $(VM_TARGET) 224 $(MAKE_ARGS) $(VM_TARGET)
214 225
215 generic_buildshark: 226 generic_buildshark:
227 $(MKDIR) -p $(OUTPUTDIR)
228 $(CD) $(OUTPUTDIR); \
229 $(MAKE) -f $(ABS_OS_MAKEFILE) \
230 $(MAKE_ARGS) $(VM_TARGET)
231
232 generic_buildgraal:
216 $(MKDIR) -p $(OUTPUTDIR) 233 $(MKDIR) -p $(OUTPUTDIR)
217 $(CD) $(OUTPUTDIR); \ 234 $(CD) $(OUTPUTDIR); \
218 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 235 $(MAKE) -f $(ABS_OS_MAKEFILE) \
219 $(MAKE_ARGS) $(VM_TARGET) 236 $(MAKE_ARGS) $(VM_TARGET)
220 237
248 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 265 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
249 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 266 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
250 KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel 267 KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
251 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero 268 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
252 SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark 269 SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
270 GRAAL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_graal
253 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) 271 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
254 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) 272 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
255 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR) 273 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
256 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) 274 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
257 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR) 275 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
276 GRAAL_DIR=$(GRAAL_BASE_DIR)/$(VM_SUBDIR)
258 277
259 # Misc files and generated files need to come from C1 or C2 area 278 # Misc files and generated files need to come from C1 or C2 area
260 ifeq ($(ZERO_BUILD), true) 279 ifeq ($(ZERO_BUILD), true)
261 ifeq ($(SHARK_BUILD), true) 280 ifeq ($(SHARK_BUILD), true)
262 MISC_DIR=$(SHARK_DIR) 281 MISC_DIR=$(SHARK_DIR)
385 $(RM) -r $(C1_DIR) 404 $(RM) -r $(C1_DIR)
386 $(RM) -r $(C2_DIR) 405 $(RM) -r $(C2_DIR)
387 $(RM) -r $(KERNEL_DIR) 406 $(RM) -r $(KERNEL_DIR)
388 $(RM) -r $(ZERO_DIR) 407 $(RM) -r $(ZERO_DIR)
389 $(RM) -r $(SHARK_DIR) 408 $(RM) -r $(SHARK_DIR)
409 $(RM) -r $(GRAAL_DIR)
390 clean_export: 410 clean_export:
391 $(RM) -r $(EXPORT_PATH) 411 $(RM) -r $(EXPORT_PATH)
392 clean_jdk: 412 clean_jdk:
393 $(RM) -r $(JDK_IMAGE_DIR) 413 $(RM) -r $(JDK_IMAGE_DIR)
394 414