1.1 --- a/make/Makefile Mon Mar 19 20:13:17 2012 +0100
1.2 +++ b/make/Makefile Mon Mar 19 10:09:24 2012 +0100
1.3 @@ -271,23 +271,25 @@
1.4 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
1.5 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
1.6
1.7 -# Misc files and generated files need to come from C1 or C2 area
1.8 -ifeq ($(ZERO_BUILD), true)
1.9 -ifeq ($(SHARK_BUILD), true)
1.10 - MISC_DIR=$(SHARK_DIR)
1.11 - GEN_DIR=$(SHARK_BASE_DIR)/generated
1.12 -else
1.13 - MISC_DIR=$(ZERO_DIR)
1.14 - GEN_DIR=$(ZERO_BASE_DIR)/generated
1.15 +ifeq ($(JVM_VARIANT_SERVER), true)
1.16 + MISC_DIR=$(C2_DIR)
1.17 + GEN_DIR=$(C2_BASE_DIR)/generated
1.18 endif
1.19 -else
1.20 -ifeq ($(ARCH_DATA_MODEL), 32)
1.21 - MISC_DIR=$(C1_DIR)
1.22 - GEN_DIR=$(C1_BASE_DIR)/generated
1.23 -else
1.24 - MISC_DIR=$(C2_DIR)
1.25 - GEN_DIR=$(C2_BASE_DIR)/generated
1.26 +ifeq ($(JVM_VARIANT_CLIENT), true)
1.27 + MISC_DIR=$(C1_DIR)
1.28 + GEN_DIR=$(C1_BASE_DIR)/generated
1.29 endif
1.30 +ifeq ($(JVM_VARIANT_KERNEL), true)
1.31 + MISC_DIR=$(C2_DIR)
1.32 + GEN_DIR=$(C2_BASE_DIR)/generated
1.33 +endif
1.34 +ifeq ($(JVM_VARIANT_ZEROSHARK), true)
1.35 + MISC_DIR=$(SHARK_DIR)
1.36 + GEN_DIR=$(SHARK_BASE_DIR)/generated
1.37 +endif
1.38 +ifeq ($(JVM_VARIANT_ZERO), true)
1.39 + MISC_DIR=$(ZERO_DIR)
1.40 + GEN_DIR=$(ZERO_BASE_DIR)/generated
1.41 endif
1.42
1.43 # Bin files (windows)
1.44 @@ -332,46 +334,46 @@
1.45
1.46 # Shared Library
1.47 ifneq ($(OSNAME),windows)
1.48 - ifeq ($(ZERO_BUILD), true)
1.49 - ifeq ($(SHARK_BUILD), true)
1.50 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
1.51 - $(install-file)
1.52 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
1.53 - $(install-file)
1.54 - else
1.55 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
1.56 - $(install-file)
1.57 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
1.58 - $(install-file)
1.59 + ifeq ($(JVM_VARIANT_SERVER), true)
1.60 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.61 + $(install-file)
1.62 + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.63 + $(install-file)
1.64 + $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.65 + $(install-file)
1.66 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
1.67 + $(install-file)
1.68 + $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
1.69 + $(install-file)
1.70 + $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
1.71 + $(install-file)
1.72 endif
1.73 - else
1.74 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.75 - $(install-file)
1.76 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.77 - $(install-file)
1.78 -$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.79 - $(install-file)
1.80 -$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.81 - $(install-file)
1.82 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.83 - $(install-file)
1.84 -$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
1.85 - $(install-file)
1.86 -
1.87 -# Debug info for shared library
1.88 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
1.89 - $(install-file)
1.90 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
1.91 - $(install-file)
1.92 -$(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
1.93 - $(install-file)
1.94 -$(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
1.95 - $(install-file)
1.96 -$(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
1.97 - $(install-file)
1.98 -$(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
1.99 - $(install-file)
1.100 - endif
1.101 + ifeq ($(JVM_VARIANT_CLIENT), true)
1.102 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.103 + $(install-file)
1.104 + $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.105 + $(install-file)
1.106 + $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
1.107 + $(install-file)
1.108 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
1.109 + $(install-file)
1.110 + $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
1.111 + $(install-file)
1.112 + $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
1.113 + $(install-file)
1.114 + endif
1.115 + ifeq ($(JVM_VARIANT_ZEROSHARK), true)
1.116 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
1.117 + $(install-file)
1.118 + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
1.119 + $(install-file)
1.120 + endif
1.121 + ifeq ($(JVM_VARIANT_ZERO), true)
1.122 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
1.123 + $(install-file)
1.124 + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
1.125 + $(install-file)
1.126 + endif
1.127 endif
1.128
1.129 # Jar file (sa-jdi.jar)
1.130 @@ -450,18 +452,19 @@
1.131 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
1.132
1.133 test_jdk:
1.134 - ifeq ($(ARCH_DATA_MODEL), 32)
1.135 - ifneq ($(ZERO_BUILD), true)
1.136 - $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion
1.137 - $(JDK_IMAGE_DIR)/bin/java -d32 -client -version
1.138 - endif
1.139 - $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion
1.140 - $(JDK_IMAGE_DIR)/bin/java -d32 -server -version
1.141 - endif
1.142 - ifeq ($(ARCH_DATA_MODEL), 64)
1.143 - $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion
1.144 - $(JDK_IMAGE_DIR)/bin/java -d64 -server -version
1.145 - endif
1.146 + ifeq ($(JVM_VARIANT_CLIENT), true)
1.147 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
1.148 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
1.149 + endif
1.150 + ifeq ($(findstring true, $(JVM_VARIANT_SERVER)\
1.151 + $(JVM_VARIANT_ZERO)$(JVM_VARIANT_ZEROSHARK)), true)
1.152 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
1.153 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
1.154 + endif
1.155 + ifeq ($(JVM_VARIANT_KERNEL), true)
1.156 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
1.157 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
1.158 + endif
1.159
1.160 copy_product_jdk::
1.161 $(RM) -r $(JDK_IMAGE_DIR)
