Mercurial > hg > graal-jvmci-8

comparison make/Makefile @ 20804:7848fc12602b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 39441c10d314 63bae08b051e
children 38216fb8941c
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
97 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal 97 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
98 98
99 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 99 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
100 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug 100 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
101 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug 101 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
102 COMMON_VM_OPTIMIZED_TARGETS=optimized optimized1 docs export_optimized
102 103
103 # JDK directory list 104 # JDK directory list
104 JDK_DIRS=bin include jre lib demo 105 JDK_DIRS=bin include jre lib demo
105 106
106 all: all_product all_fastdebug 107 all: all_product all_fastdebug
113 114
114 ifdef BUILD_CLIENT_ONLY 115 ifdef BUILD_CLIENT_ONLY
115 all_product: product1 docs export_product 116 all_product: product1 docs export_product
116 all_fastdebug: fastdebug1 docs export_fastdebug 117 all_fastdebug: fastdebug1 docs export_fastdebug
117 all_debug: debug1 docs export_debug 118 all_debug: debug1 docs export_debug
119 all_optimized: optimized1 docs export_optimized
118 else 120 else
119 ifeq ($(MACOSX_UNIVERSAL),true) 121 ifeq ($(MACOSX_UNIVERSAL),true)
120 all_product: universal_product 122 all_product: universal_product
121 all_fastdebug: universal_fastdebug 123 all_fastdebug: universal_fastdebug
122 all_debug: universal_debug 124 all_debug: universal_debug
125 all_optimized: universal_optimized
123 else 126 else
124 all_product: $(COMMON_VM_PRODUCT_TARGETS) 127 all_product: $(COMMON_VM_PRODUCT_TARGETS)
125 all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS) 128 all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS)
126 all_debug: $(COMMON_VM_DEBUG_TARGETS) 129 all_debug: $(COMMON_VM_DEBUG_TARGETS)
127 endif 130 all_optimized: $(COMMON_VM_OPTIMIZED_TARGETS)
128 endif 131 endif
129 132 endif
130 all_optimized: optimized optimized1 docs export_optimized
131 133
132 allzero: all_productzero all_fastdebugzero 134 allzero: all_productzero all_fastdebugzero
133 all_productzero: productzero docs export_product 135 all_productzero: productzero docs export_product
134 all_fastdebugzero: fastdebugzero docs export_fastdebug 136 all_fastdebugzero: fastdebugzero docs export_fastdebug
135 all_debugzero: debugzero docs export_debug 137 all_debugzero: debugzero docs export_debug
334 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export 336 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) EXPORT_SUBDIR=/$(@:export_%=%) generic_export
335 337
336 export_product_jdk:: 338 export_product_jdk::
337 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export 339 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export
338 export_optimized_jdk:: 340 export_optimized_jdk::
339 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) generic_export 341 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
340 export_fastdebug_jdk:: 342 export_fastdebug_jdk::
341 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export 343 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
342 export_debug_jdk:: 344 export_debug_jdk::
343 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export 345 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) generic_export
344 346
774 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \ 776 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
775 else \ 777 else \
776 ($(CD) $(JDK_IMPORT_PATH) && \ 778 ($(CD) $(JDK_IMPORT_PATH) && \
777 $(TAR) -cf - $(JDK_DIRS)) | \ 779 $(TAR) -cf - $(JDK_DIRS)) | \
778 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \ 780 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
781 fi
782
783 copy_optimized_jdk::
784 $(RM) -r $(JDK_IMAGE_DIR)/optimized
785 $(MKDIR) -p $(JDK_IMAGE_DIR)/optimized
786 if [ -d $(JDK_IMPORT_PATH)/optimized ] ; then \
787 ($(CD) $(JDK_IMPORT_PATH)/optimized && \
788 $(TAR) -cf - $(JDK_DIRS)) | \
789 ($(CD) $(JDK_IMAGE_DIR)/optimized && $(TAR) -xf -) ; \
790 else \
791 ($(CD) $(JDK_IMPORT_PATH) && \
792 $(TAR) -cf - $(JDK_DIRS)) | \
793 ($(CD) $(JDK_IMAGE_DIR)/optimized && $(TAR) -xf -) ; \
779 fi 794 fi
780 795
781 # 796 #
782 # Check target 797 # Check target
783 # 798 #