equal
deleted
inserted
replaced
1 # |
1 # |
2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. |
7 # published by the Free Software Foundation. |
155 endif |
155 endif |
156 |
156 |
157 MAKE_ARGS += RM="$(RM)" |
157 MAKE_ARGS += RM="$(RM)" |
158 MAKE_ARGS += ZIPEXE=$(ZIPEXE) |
158 MAKE_ARGS += ZIPEXE=$(ZIPEXE) |
159 |
159 |
160 # On 32 bit windows we build server, client and kernel, on 64 bit just server. |
160 # On 32 bit windows we build server and client, on 64 bit just server. |
161 ifeq ($(JVM_VARIANTS),) |
161 ifeq ($(JVM_VARIANTS),) |
162 ifeq ($(ARCH_DATA_MODEL), 32) |
162 ifeq ($(ARCH_DATA_MODEL), 32) |
163 JVM_VARIANTS:=client,server |
163 JVM_VARIANTS:=client,server |
164 JVM_VARIANT_CLIENT:=true |
164 JVM_VARIANT_CLIENT:=true |
165 JVM_VARIANT_SERVER:=true |
165 JVM_VARIANT_SERVER:=true |
248 endif |
248 endif |
249 endif |
249 endif |
250 |
250 |
251 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server |
251 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server |
252 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client |
252 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client |
253 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel |
|
254 |
253 |
255 ifeq ($(JVM_VARIANT_SERVER),true) |
254 ifeq ($(JVM_VARIANT_SERVER),true) |
256 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
255 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
257 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) |
256 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) |
258 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
257 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
275 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb |
274 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb |
276 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map |
275 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map |
277 endif |
276 endif |
278 endif |
277 endif |
279 endif |
278 endif |
280 ifeq ($(JVM_VARIANT_KERNEL),true) |
|
281 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt |
|
282 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX) |
|
283 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
|
284 ifeq ($(ZIP_DEBUGINFO_FILES),1) |
|
285 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.diz |
|
286 else |
|
287 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb |
|
288 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map |
|
289 endif |
|
290 endif |
|
291 endif |
|
292 |
279 |
293 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar |
280 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar |
294 |
281 |
295 ifeq ($(BUILD_WIN_SA), 1) |
282 ifeq ($(BUILD_WIN_SA), 1) |
296 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) |
283 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) |