Mercurial > hg > truffle

comparison make/Makefile @ 5946:3d7ea1dbe0de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built Reviewed-by: dholmes, ohair
author erikj
date Mon, 19 Mar 2012 10:09:24 +0100
parents 2d503de963b3
children 74c359c4a9e5
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
269 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) 269 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
270 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR) 270 KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
271 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) 271 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
272 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR) 272 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
273 273
274 # Misc files and generated files need to come from C1 or C2 area 274 ifeq ($(JVM_VARIANT_SERVER), true)
275 ifeq ($(ZERO_BUILD), true) 275 MISC_DIR=$(C2_DIR)
276 ifeq ($(SHARK_BUILD), true) 276 GEN_DIR=$(C2_BASE_DIR)/generated
277 MISC_DIR=$(SHARK_DIR) 277 endif
278 GEN_DIR=$(SHARK_BASE_DIR)/generated 278 ifeq ($(JVM_VARIANT_CLIENT), true)
279 else 279 MISC_DIR=$(C1_DIR)
280 MISC_DIR=$(ZERO_DIR) 280 GEN_DIR=$(C1_BASE_DIR)/generated
281 GEN_DIR=$(ZERO_BASE_DIR)/generated 281 endif
282 endif 282 ifeq ($(JVM_VARIANT_KERNEL), true)
283 else 283 MISC_DIR=$(C2_DIR)
284 ifeq ($(ARCH_DATA_MODEL), 32) 284 GEN_DIR=$(C2_BASE_DIR)/generated
285 MISC_DIR=$(C1_DIR) 285 endif
286 GEN_DIR=$(C1_BASE_DIR)/generated 286 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
287 else 287 MISC_DIR=$(SHARK_DIR)
288 MISC_DIR=$(C2_DIR) 288 GEN_DIR=$(SHARK_BASE_DIR)/generated
289 GEN_DIR=$(C2_BASE_DIR)/generated 289 endif
290 endif 290 ifeq ($(JVM_VARIANT_ZERO), true)
291 MISC_DIR=$(ZERO_DIR)
292 GEN_DIR=$(ZERO_BASE_DIR)/generated
291 endif 293 endif
292 294
293 # Bin files (windows) 295 # Bin files (windows)
294 ifeq ($(OSNAME),windows) 296 ifeq ($(OSNAME),windows)
295 297
330 $(install-file) 332 $(install-file)
331 endif 333 endif
332 334
333 # Shared Library 335 # Shared Library
334 ifneq ($(OSNAME),windows) 336 ifneq ($(OSNAME),windows)
335 ifeq ($(ZERO_BUILD), true) 337 ifeq ($(JVM_VARIANT_SERVER), true)
336 ifeq ($(SHARK_BUILD), true) 338 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
337 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 339 $(install-file)
338 $(install-file) 340 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
339 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 341 $(install-file)
340 $(install-file) 342 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
341 else 343 $(install-file)
342 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 344 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
343 $(install-file) 345 $(install-file)
344 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 346 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
345 $(install-file) 347 $(install-file)
348 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
349 $(install-file)
346 endif 350 endif
347 else 351 ifeq ($(JVM_VARIANT_CLIENT), true)
348 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 352 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
349 $(install-file) 353 $(install-file)
350 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 354 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
351 $(install-file) 355 $(install-file)
352 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 356 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
353 $(install-file) 357 $(install-file)
354 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 358 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
355 $(install-file) 359 $(install-file)
356 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 360 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
357 $(install-file) 361 $(install-file)
358 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 362 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
359 $(install-file) 363 $(install-file)
360 364 endif
361 # Debug info for shared library 365 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
362 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 366 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
363 $(install-file) 367 $(install-file)
364 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 368 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
365 $(install-file) 369 $(install-file)
366 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 370 endif
367 $(install-file) 371 ifeq ($(JVM_VARIANT_ZERO), true)
368 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo 372 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
369 $(install-file) 373 $(install-file)
370 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 374 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
371 $(install-file) 375 $(install-file)
372 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo 376 endif
373 $(install-file)
374 endif
375 endif 377 endif
376 378
377 # Jar file (sa-jdi.jar) 379 # Jar file (sa-jdi.jar)
378 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar 380 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
379 $(install-file) 381 $(install-file)
448 ($(CD) $(JDK_IMPORT_PATH) && \ 450 ($(CD) $(JDK_IMPORT_PATH) && \
449 $(TAR) -cf - *) | \ 451 $(TAR) -cf - *) | \
450 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 452 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
451 453
452 test_jdk: 454 test_jdk:
453 ifeq ($(ARCH_DATA_MODEL), 32) 455 ifeq ($(JVM_VARIANT_CLIENT), true)
454 ifneq ($(ZERO_BUILD), true) 456 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
455 $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion 457 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
456 $(JDK_IMAGE_DIR)/bin/java -d32 -client -version 458 endif
457 endif 459 ifeq ($(findstring true, $(JVM_VARIANT_SERVER)\
458 $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion 460 $(JVM_VARIANT_ZERO)$(JVM_VARIANT_ZEROSHARK)), true)
459 $(JDK_IMAGE_DIR)/bin/java -d32 -server -version 461 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
460 endif 462 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
461 ifeq ($(ARCH_DATA_MODEL), 64) 463 endif
462 $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion 464 ifeq ($(JVM_VARIANT_KERNEL), true)
463 $(JDK_IMAGE_DIR)/bin/java -d64 -server -version 465 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
464 endif 466 $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
467 endif
465 468
466 copy_product_jdk:: 469 copy_product_jdk::
467 $(RM) -r $(JDK_IMAGE_DIR) 470 $(RM) -r $(JDK_IMAGE_DIR)
468 $(MKDIR) -p $(JDK_IMAGE_DIR) 471 $(MKDIR) -p $(JDK_IMAGE_DIR)
469 ($(CD) $(JDK_IMPORT_PATH) && \ 472 ($(CD) $(JDK_IMPORT_PATH) && \