1.1 --- a/make/Makefile Mon Jan 30 23:27:30 2012 -0500
1.2 +++ b/make/Makefile Wed Feb 01 15:01:08 2012 -0500
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -89,19 +89,31 @@
1.11 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
1.12 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
1.13
1.14 +COMMON_VM_PRODUCT_TARGETS=product product1 productkernel docs export_product
1.15 +COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
1.16 +COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 jvmgkernel docs export_debug
1.17 +
1.18 # JDK directory list
1.19 JDK_DIRS=bin include jre lib demo
1.20
1.21 all: all_product all_fastdebug
1.22 -ifndef BUILD_CLIENT_ONLY
1.23 -all_product: product product1 productkernel docs export_product
1.24 -all_fastdebug: fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
1.25 -all_debug: jvmg jvmg1 jvmgkernel docs export_debug
1.26 -else
1.27 +
1.28 +ifdef BUILD_CLIENT_ONLY
1.29 all_product: product1 docs export_product
1.30 all_fastdebug: fastdebug1 docs export_fastdebug
1.31 all_debug: jvmg1 docs export_debug
1.32 +else
1.33 +ifeq ($(MACOSX_UNIVERSAL),true)
1.34 +all_product: universal_product
1.35 +all_fastdebug: universal_fastdebug
1.36 +all_debug: universal_debug
1.37 +else
1.38 +all_product: $(COMMON_VM_PRODUCT_TARGETS)
1.39 +all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS)
1.40 +all_debug: $(COMMON_VM_DEBUG_TARGETS)
1.41 endif
1.42 +endif
1.43 +
1.44 all_optimized: optimized optimized1 optimizedkernel docs export_optimized
1.45
1.46 allzero: all_productzero all_fastdebugzero
1.47 @@ -232,20 +244,19 @@
1.48 $(MAKE) VM_SUBDIR=${VM_DEBUG} EXPORT_SUBDIR=/debug generic_export
1.49 export_optimized:
1.50 $(MAKE) VM_SUBDIR=optimized EXPORT_SUBDIR=/optimized generic_export
1.51 -export_product_jdk:
1.52 +export_product_jdk::
1.53 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
1.54 VM_SUBDIR=product generic_export
1.55 -export_optimized_jdk:
1.56 +export_optimized_jdk::
1.57 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
1.58 VM_SUBDIR=optimized generic_export
1.59 -export_fastdebug_jdk:
1.60 +export_fastdebug_jdk::
1.61 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/fastdebug \
1.62 VM_SUBDIR=fastdebug generic_export
1.63 -export_debug_jdk:
1.64 +export_debug_jdk::
1.65 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/debug \
1.66 VM_SUBDIR=${VM_DEBUG} generic_export
1.67
1.68 -
1.69 # Export file copy rules
1.70 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
1.71 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
1.72 @@ -444,14 +455,14 @@
1.73 endif
1.74 $(JDK_IMAGE_DIR)/bin/java -server -version
1.75
1.76 -copy_product_jdk:
1.77 +copy_product_jdk::
1.78 $(RM) -r $(JDK_IMAGE_DIR)
1.79 $(MKDIR) -p $(JDK_IMAGE_DIR)
1.80 ($(CD) $(JDK_IMPORT_PATH) && \
1.81 $(TAR) -cf - $(JDK_DIRS)) | \
1.82 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
1.83
1.84 -copy_fastdebug_jdk:
1.85 +copy_fastdebug_jdk::
1.86 $(RM) -r $(JDK_IMAGE_DIR)/fastdebug
1.87 $(MKDIR) -p $(JDK_IMAGE_DIR)/fastdebug
1.88 if [ -d $(JDK_IMPORT_PATH)/fastdebug ] ; then \
1.89 @@ -464,7 +475,7 @@
1.90 ($(CD) $(JDK_IMAGE_DIR)/fastdebug && $(TAR) -xf -) ; \
1.91 fi
1.92
1.93 -copy_debug_jdk:
1.94 +copy_debug_jdk::
1.95 $(RM) -r $(JDK_IMAGE_DIR)/debug
1.96 $(MKDIR) -p $(JDK_IMAGE_DIR)/debug
1.97 if [ -d $(JDK_IMPORT_PATH)/debug ] ; then \
1.98 @@ -481,36 +492,6 @@
1.99 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
1.100 fi
1.101
1.102 -# macosx universal builds
1.103 -
1.104 -ifeq ($(MACOSX_UNIVERSAL), true)
1.105 -$(UNIVERSAL_LIPO_LIST):
1.106 - lipo -create -output $@ $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)
1.107 -
1.108 -$(UNIVERSAL_COPY_LIST):
1.109 - $(CP) $(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) $@
1.110 -
1.111 -universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
1.112 -endif
1.113 -
1.114 -universal_product:
1.115 - $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_product
1.116 - $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_product
1.117 - $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
1.118 - $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
1.119 -
1.120 -universal_fastdebug:
1.121 - $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_fastdebug
1.122 - $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_fastdebug
1.123 - $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
1.124 - $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
1.125 -
1.126 -universal_debug:
1.127 - $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_debug
1.128 - $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_debug
1.129 - $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
1.130 - $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
1.131 -
1.132 #
1.133 # Check target
1.134 #
1.135 @@ -630,6 +611,13 @@
1.136 @$(ECHO) \
1.137 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
1.138
1.139 +# Universal build support
1.140 +ifeq ($(OS_VENDOR), Darwin)
1.141 +ifeq ($(MACOSX_UNIVERSAL),true)
1.142 +include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
1.143 +endif
1.144 +endif
1.145 +
1.146 # JPRT rule to build this workspace
1.147 include $(GAMMADIR)/make/jprt.gmk
1.148
1.149 @@ -639,6 +627,4 @@
1.150 export_product export_fastdebug export_debug export_optimized \
1.151 export_jdk_product export_jdk_fastdebug export_jdk_debug \
1.152 create_jdk copy_jdk update_jdk test_jdk \
1.153 - copy_product_jdk copy_fastdebug_jdk copy_debug_jdk universalize \
1.154 - universal_product
1.155 -
1.156 + copy_product_jdk copy_fastdebug_jdk copy_debug_jdk
