Mercurial > hg > graal-jvmci-8

comparison make/Makefile @ 4940:f09ae3853e3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk Reviewed-by: rbackman, jrose, dholmes
author twisti
date Mon, 13 Feb 2012 04:30:59 -0800
parents 481a9443f721
children 33df1aeaebbf 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
4939:45a1bf98f1bb 4940:f09ae3853e3b
400 ifeq ($JFR_EXISTS,1) 400 ifeq ($JFR_EXISTS,1)
401 $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/% 401 $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/%
402 $(install-file) 402 $(install-file)
403 else 403 else
404 $(EXPORT_INCLUDE_DIR)/jfr.h: 404 $(EXPORT_INCLUDE_DIR)/jfr.h:
405
406 endif 405 endif
407 406
408 # Doc files (jvmti.html) 407 # Doc files (jvmti.html)
409 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/% 408 $(EXPORT_DOCS_DIR)/platform/jvmti/%: $(DOCS_DIR)/%
410 $(install-file) 409 $(install-file)
446 ($(CD) $(JDK_IMPORT_PATH) && \ 445 ($(CD) $(JDK_IMPORT_PATH) && \
447 $(TAR) -cf - *) | \ 446 $(TAR) -cf - *) | \
448 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 447 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
449 448
450 test_jdk: 449 test_jdk:
451 ifneq ($(ZERO_BUILD), true)
452 ifeq ($(ARCH_DATA_MODEL), 32) 450 ifeq ($(ARCH_DATA_MODEL), 32)
453 $(JDK_IMAGE_DIR)/bin/java -client -version 451 ifneq ($(ZERO_BUILD), true)
452 $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion
453 $(JDK_IMAGE_DIR)/bin/java -d32 -client -version
454 endif
455 $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion
456 $(JDK_IMAGE_DIR)/bin/java -d32 -server -version
454 endif 457 endif
455 endif 458 ifeq ($(ARCH_DATA_MODEL), 64)
456 $(JDK_IMAGE_DIR)/bin/java -server -version 459 $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion
460 $(JDK_IMAGE_DIR)/bin/java -d64 -server -version
461 endif
457 462
458 copy_product_jdk:: 463 copy_product_jdk::
459 $(RM) -r $(JDK_IMAGE_DIR) 464 $(RM) -r $(JDK_IMAGE_DIR)
460 $(MKDIR) -p $(JDK_IMAGE_DIR) 465 $(MKDIR) -p $(JDK_IMAGE_DIR)
461 ($(CD) $(JDK_IMPORT_PATH) && \ 466 ($(CD) $(JDK_IMPORT_PATH) && \
543 # One line descriptions for the variables 548 # One line descriptions for the variables
544 SLASH_JAVA.desc = Root of all build tools, e.g. /java or J: 549 SLASH_JAVA.desc = Root of all build tools, e.g. /java or J:
545 OUTPUTDIR.desc = Output directory, default is build/<osname> 550 OUTPUTDIR.desc = Output directory, default is build/<osname>
546 BOOTDIR.desc = JDK used to compile agent java source and test with 551 BOOTDIR.desc = JDK used to compile agent java source and test with
547 JDK_IMPORT_PATH.desc = Promoted JDK to copy for 'create_jdk' 552 JDK_IMPORT_PATH.desc = Promoted JDK to copy for 'create_jdk'
553 JDK_IMAGE_DIR.desc = Directory to place JDK to copy
548 EXPORT_PATH.desc = Directory to place files to export for JDK build 554 EXPORT_PATH.desc = Directory to place files to export for JDK build
549 555
550 # Make variables to print out (description and value) 556 # Make variables to print out (description and value)
551 VARIABLE_PRINTVAL_LIST += \ 557 VARIABLE_PRINTVAL_LIST += \
552 SLASH_JAVA \ 558 SLASH_JAVA \
553 OUTPUTDIR \ 559 OUTPUTDIR \
554 BOOTDIR \ 560 BOOTDIR \
555 JDK_IMPORT_PATH \ 561 JDK_IMPORT_PATH \
562 JDK_IMAGE_DIR \
556 EXPORT_PATH 563 EXPORT_PATH
557 564
558 # Make variables that should refer to directories that exist 565 # Make variables that should refer to directories that exist
559 VARIABLE_CHECKDIR_LIST += \ 566 VARIABLE_CHECKDIR_LIST += \
560 SLASH_JAVA \ 567 SLASH_JAVA \