1.1 --- a/make/Makefile Fri Apr 12 12:22:59 2013 -0700
1.2 +++ b/make/Makefile Fri Apr 12 15:53:30 2013 -0700
1.3 @@ -19,7 +19,7 @@
1.4 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.5 # or visit www.oracle.com if you need additional information or have any
1.6 # questions.
1.7 -#
1.8 +#
1.9 #
1.10
1.11 # Top level gnumake file for hotspot builds
1.12 @@ -85,15 +85,15 @@
1.13 endif
1.14
1.15 # Typical C1/C2 targets made available with this Makefile
1.16 -C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
1.17 -C2_VM_TARGETS=product fastdebug optimized jvmg
1.18 -ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
1.19 -SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
1.20 -MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1
1.21 +C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
1.22 +C2_VM_TARGETS=product fastdebug optimized debug
1.23 +ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
1.24 +SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
1.25 +MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
1.26
1.27 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
1.28 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
1.29 -COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug
1.30 +COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
1.31
1.32 # JDK directory list
1.33 JDK_DIRS=bin include jre lib demo
1.34 @@ -103,13 +103,13 @@
1.35 ifeq ($(JVM_VARIANT_MINIMAL1),true)
1.36 all_product: productminimal1
1.37 all_fastdebug: fastdebugminimal1
1.38 -all_debug: jvmgminimal1
1.39 +all_debug: debugminimal1
1.40 endif
1.41
1.42 ifdef BUILD_CLIENT_ONLY
1.43 all_product: product1 docs export_product
1.44 all_fastdebug: fastdebug1 docs export_fastdebug
1.45 -all_debug: jvmg1 docs export_debug
1.46 +all_debug: debug1 docs export_debug
1.47 else
1.48 ifeq ($(MACOSX_UNIVERSAL),true)
1.49 all_product: universal_product
1.50 @@ -127,13 +127,13 @@
1.51 allzero: all_productzero all_fastdebugzero
1.52 all_productzero: productzero docs export_product
1.53 all_fastdebugzero: fastdebugzero docs export_fastdebug
1.54 -all_debugzero: jvmgzero docs export_debug
1.55 +all_debugzero: debugzero docs export_debug
1.56 all_optimizedzero: optimizedzero docs export_optimized
1.57
1.58 allshark: all_productshark all_fastdebugshark
1.59 all_productshark: productshark docs export_product
1.60 all_fastdebugshark: fastdebugshark docs export_fastdebug
1.61 -all_debugshark: jvmgshark docs export_debug
1.62 +all_debugshark: debugshark docs export_debug
1.63 all_optimizedshark: optimizedshark docs export_optimized
1.64
1.65 # Do everything
1.66 @@ -227,7 +227,7 @@
1.67 $(MKDIR) -p $(OUTPUTDIR)
1.68 $(CD) $(OUTPUTDIR); \
1.69 $(MAKE) -f $(ABS_OS_MAKEFILE) \
1.70 - $(MAKE_ARGS) $(VM_TARGET)
1.71 + $(MAKE_ARGS) $(VM_TARGET)
1.72
1.73 generic_buildminimal1:
1.74 ifeq ($(JVM_VARIANT_MINIMAL1),true)
1.75 @@ -260,7 +260,7 @@
1.76 EXPORT_SUBDIR=/$(@:export_%=%) \
1.77 generic_export
1.78 export_debug:
1.79 - $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \
1.80 + $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
1.81 EXPORT_SUBDIR=/$(@:export_%=%) \
1.82 generic_export
1.83 export_optimized:
1.84 @@ -281,7 +281,7 @@
1.85 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
1.86 generic_export
1.87 export_debug_jdk::
1.88 - $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \
1.89 + $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \
1.90 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
1.91 generic_export
1.92
1.93 @@ -323,7 +323,7 @@
1.94 # Bin files (windows)
1.95 ifeq ($(OSNAME),windows)
1.96
1.97 -# Get jvm.lib
1.98 +# Get jvm.lib
1.99 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib
1.100 $(install-file)
1.101
1.102 @@ -541,11 +541,11 @@
1.103 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
1.104
1.105 # C2 test targets
1.106 -test_product test_optimized test_fastdebug test_jvmg:
1.107 +test_product test_optimized test_fastdebug test_debug:
1.108 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
1.109
1.110 # C1 test targets
1.111 -test_product1 test_optimized1 test_fastdebug1 test_jvmg1:
1.112 +test_product1 test_optimized1 test_fastdebug1 test_debug1:
1.113 ifeq ($(ARCH_DATA_MODEL), 32)
1.114 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
1.115 else
1.116 @@ -553,15 +553,15 @@
1.117 endif
1.118
1.119 # Zero test targets
1.120 -test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero:
1.121 +test_productzero test_optimizedzero test_fastdebugzero test_debugzero:
1.122 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
1.123
1.124 # Shark test targets
1.125 -test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark:
1.126 +test_productshark test_optimizedshark test_fastdebugshark test_debugshark:
1.127 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
1.128
1.129 # Minimal1 test targets
1.130 -test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1:
1.131 +test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_debugminimal1:
1.132 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
1.133
1.134
1.135 @@ -626,7 +626,7 @@
1.136 # Intro help message
1.137 intro_help:
1.138 @$(ECHO) \
1.139 -"Makefile for the Hotspot workspace."
1.140 +"Makefile for the Hotspot workspace."
1.141 @$(ECHO) \
1.142 "Default behavior is to build and create an export area for the j2se builds."
1.143
1.144 @@ -637,7 +637,7 @@
1.145 @$(ECHO) "world: Same as: all create_jdk"
1.146 @$(ECHO) "all_product: Same as: product product1 export_product"
1.147 @$(ECHO) "all_fastdebug: Same as: fastdebug fastdebug1 export_fastdebug"
1.148 - @$(ECHO) "all_debug: Same as: jvmg jvmg1 export_debug"
1.149 + @$(ECHO) "all_debug: Same as: debug debug1 export_debug"
1.150 @$(ECHO) "all_optimized: Same as: optimized optimized1 export_optimized"
1.151 @$(ECHO) "clean: Clean all areas"
1.152 @$(ECHO) "export_product: Export product files to EXPORT_PATH"
1.153 @@ -730,7 +730,7 @@
1.154 @$(ECHO) \
1.155 " $(MAKE) world"
1.156 @$(ECHO) \
1.157 -" $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
1.158 +" $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
1.159 @$(ECHO) \
1.160 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
1.161
1.162 @@ -741,6 +741,23 @@
1.163 endif
1.164 endif
1.165
1.166 +# Compatibility for transition to new naming
1.167 +warn_jvmg_deprecated:
1.168 + echo "Warning: The jvmg target has been replaced with debug"
1.169 + echo "Warning: Please update your usage"
1.170 +
1.171 +jvmg: warn_jvmg_deprecated debug
1.172 +
1.173 +jvmg1: warn_jvmg_deprecated debug1
1.174 +
1.175 +jvmgminimal1: warn_jvmg_deprecated debugminimal1
1.176 +
1.177 +jvmgcore: warn_jvmg_deprecated debugcore
1.178 +
1.179 +jvmgzero: warn_jvmg_deprecated debugzero
1.180 +
1.181 +jvmgshark: warn_jvmg_deprecated debugshark
1.182 +
1.183 # JPRT rule to build this workspace
1.184 include $(GAMMADIR)/make/jprt.gmk
1.185
