author | dcherepanov |
Fri, 08 Apr 2011 17:58:18 +0400 | |
changeset 9835 | 1b8f203cda76 |
parent 8793 | a25480ff1a6b |
child 9035 | 1255eb81cc2f |
permissions | -rw-r--r-- |
2 | 1 |
# |
7668 | 2 |
# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
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 |
|
5506 | 7 |
# published by the Free Software Foundation. Oracle designates this |
2 | 8 |
# particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
# by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
# |
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
5506 | 21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
2 | 24 |
# |
25 |
||
26 |
# |
|
27 |
# Imports files exported by a hotspot build or provided from an external |
|
28 |
# location into the OUTPUTDIR, and also primes the OUTPUTDIR with files |
|
29 |
# that are provided inside this workspace. |
|
30 |
# |
|
31 |
# IMPORT_LIST contains the list of destination files that are copied |
|
32 |
# from external places (outside this workspace). |
|
33 |
# |
|
34 |
# INTERNAL_IMPORT_LIST is the list of destination files from BUILDDIR. |
|
35 |
# |
|
36 |
||
37 |
BUILDDIR = ../.. |
|
38 |
PRODUCT = java |
|
39 |
include $(BUILDDIR)/common/Defs.gmk |
|
40 |
||
41 |
SERVER_LOCATION = server |
|
42 |
CLIENT_LOCATION = client |
|
43 |
||
44 |
DB_SUFFIX = _db |
|
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
45 |
DTRACE_SUFFIX = _dtrace |
2 | 46 |
|
47 |
ifeq ($(PLATFORM), windows) |
|
48 |
LIB_LOCATION = $(BINDIR) |
|
49 |
else |
|
50 |
LIB_LOCATION = $(LIBDIR)/$(LIBARCH) |
|
51 |
endif |
|
52 |
||
53 |
JVM_NAME = $(LIB_PREFIX)jvm.$(LIBRARY_SUFFIX) |
|
54 |
JVMLIB_NAME = $(LIB_PREFIX)jvm.$(LIB_SUFFIX) |
|
55 |
JVMMAP_NAME = $(LIB_PREFIX)jvm.map |
|
56 |
JVMPDB_NAME = $(LIB_PREFIX)jvm.pdb |
|
57 |
LIBJSIG_NAME = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX) |
|
58 |
JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX) |
|
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
59 |
JVMDTRACE_NAME = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX) |
2 | 60 |
|
61 |
CLASSSHARINGDATA_DIR = $(BUILDDIR)/tools/sharing |
|
62 |
||
63 |
# Needed to do file copy |
|
64 |
ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR)) |
|
65 |
||
4917
c98da2209f8c
6915413: Module build: building of specified jdk components instead of all
mchung
parents:
4665
diff
changeset
|
66 |
SUBDIRS_desktop = fonts |
c98da2209f8c
6915413: Module build: building of specified jdk components instead of all
mchung
parents:
4665
diff
changeset
|
67 |
SUBDIRS_tools = sajdi |
c98da2209f8c
6915413: Module build: building of specified jdk components instead of all
mchung
parents:
4665
diff
changeset
|
68 |
include $(BUILDDIR)/common/Subdirs.gmk |
c98da2209f8c
6915413: Module build: building of specified jdk components instead of all
mchung
parents:
4665
diff
changeset
|
69 |
|
4665
d14dc3d9e1fa
6911737: Module build: generate modules with native libraries and any other files not in jar
mchung
parents:
4340
diff
changeset
|
70 |
all clean clobber:: |
d14dc3d9e1fa
6911737: Module build: generate modules with native libraries and any other files not in jar
mchung
parents:
4340
diff
changeset
|
71 |
$(SUBDIRS-loop) |
d14dc3d9e1fa
6911737: Module build: generate modules with native libraries and any other files not in jar
mchung
parents:
4340
diff
changeset
|
72 |
|
d14dc3d9e1fa
6911737: Module build: generate modules with native libraries and any other files not in jar
mchung
parents:
4340
diff
changeset
|
73 |
all:: build |
2 | 74 |
|
75 |
# List of files created here or coming from BUILDDIR area (this workspace) |
|
76 |
INTERNAL_IMPORT_LIST = $(LIBDIR)/classlist |
|
77 |
||
78 |
# List of files coming from outside this workspace |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
79 |
ifndef BUILD_CLIENT_ONLY |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
80 |
IMPORT_LIST = $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME) \ |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
81 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
82 |
else |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
83 |
IMPORT_LIST = |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
84 |
endif |
2 | 85 |
|
4111
ffc9c33335f4
6891677: java/build integrate zero assembler JDK changes
gbenson
parents:
3288
diff
changeset
|
86 |
# Hotspot client is only available on 32-bit non-Zero builds |
ffc9c33335f4
6891677: java/build integrate zero assembler JDK changes
gbenson
parents:
3288
diff
changeset
|
87 |
ifneq ($(ZERO_BUILD), true) |
2 | 88 |
ifeq ($(ARCH_DATA_MODEL), 32) |
89 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) \ |
|
90 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt |
|
91 |
endif |
|
4111
ffc9c33335f4
6891677: java/build integrate zero assembler JDK changes
gbenson
parents:
3288
diff
changeset
|
92 |
endif |
2 | 93 |
|
94 |
ifeq ($(PLATFORM), windows) |
|
95 |
# Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Windows |
|
96 |
||
97 |
IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%) |
|
98 |
||
1776
33e9405ab91b
6754862: jdk/src/windows/bin/java_md.c: hardcoded reference to msvcr71.dll
tbell
parents:
2
diff
changeset
|
99 |
$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL) |
2 | 100 |
$(install-import-file) |
4665
d14dc3d9e1fa
6911737: Module build: generate modules with native libraries and any other files not in jar
mchung
parents:
4340
diff
changeset
|
101 |
$(call chmod-file, a+x) |
2 | 102 |
|
103 |
# Get the hotspot .map and .pdb files for client and server |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
104 |
ifndef BUILD_CLIENT_ONLY |
2 | 105 |
IMPORT_LIST += \ |
106 |
$(LIBDIR)/$(JVMLIB_NAME) \ |
|
107 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \ |
|
108 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME) |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
109 |
endif |
2 | 110 |
|
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
111 |
# Add .map and .pdb files to the import path for client and kernel VMs. |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
112 |
# These are only available on 32-bit windows builds. |
2 | 113 |
ifeq ($(ARCH_DATA_MODEL), 32) |
114 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \ |
|
115 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME) |
|
3114
f503507dcce5
6853152: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. - still broken
herrick
parents:
3111
diff
changeset
|
116 |
ifeq ($(DO_KERNEL), true) |
f503507dcce5
6853152: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. - still broken
herrick
parents:
3111
diff
changeset
|
117 |
IMPORT_LIST += $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME) \ |
f503507dcce5
6853152: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. - still broken
herrick
parents:
3111
diff
changeset
|
118 |
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME) |
f503507dcce5
6853152: JDK 7 cannot build w/o ALT_HOTSPOT_KERNEL_PATH set. - still broken
herrick
parents:
3111
diff
changeset
|
119 |
endif |
2 | 120 |
endif |
121 |
||
122 |
$(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME) |
|
123 |
$(install-import-file) |
|
124 |
||
125 |
# it is OK for the .map and .pdb files to not exist, so do not force a |
|
126 |
# dependency on them from the bootstrap location, and allow the copy to fail. |
|
127 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME): |
|
128 |
@$(prep-target) |
|
129 |
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@ |
|
130 |
||
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
131 |
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME): |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
132 |
@$(prep-target) |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
133 |
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@ |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
134 |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
135 |
ifndef BUILD_CLIENT_ONLY |
2 | 136 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME): |
137 |
@$(prep-target) |
|
138 |
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@ |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
139 |
endif |
2 | 140 |
|
141 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME): |
|
142 |
@$(prep-target) |
|
143 |
-$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@ |
|
144 |
||
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
145 |
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME): |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
146 |
@$(prep-target) |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
147 |
-$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@ |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
148 |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
149 |
ifndef BUILD_CLIENT_ONLY |
2 | 150 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME): |
151 |
@$(prep-target) |
|
152 |
-$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@ |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
153 |
endif |
2 | 154 |
|
155 |
# Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows |
|
156 |
else # PLATFORM |
|
157 |
# NOT Windows vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv NOT Windows |
|
158 |
||
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
159 |
IMPORT_LIST += $(LIB_LOCATION)/$(LIBJSIG_NAME) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
160 |
ifndef BUILD_CLIENT_ONLY |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
161 |
IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
162 |
endif |
2 | 163 |
|
164 |
ifeq ($(PLATFORM), solaris) |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
165 |
ifndef BUILD_CLIENT_ONLY |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
166 |
IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
167 |
# The conditional can be removed when import JDKs contain these files. |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
168 |
ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)),) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
169 |
IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
170 |
else |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
171 |
$(warning WARNING: $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME) not found!) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
172 |
endif |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
173 |
endif |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
174 |
endif |
2 | 175 |
|
4111
ffc9c33335f4
6891677: java/build integrate zero assembler JDK changes
gbenson
parents:
3288
diff
changeset
|
176 |
ifneq ($(ZERO_BUILD), true) |
2 | 177 |
ifeq ($(ARCH_DATA_MODEL), 32) |
178 |
||
179 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) |
|
180 |
||
181 |
ifeq ($(PLATFORM), solaris) |
|
182 |
# solaris vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv solaris |
|
183 |
||
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
184 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
185 |
|
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
186 |
# The conditional can be removed when import JDKs contain these files. |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
187 |
ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)),) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
188 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
189 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
190 |
IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
191 |
else |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
192 |
$(warning WARNING: $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) not found!) |
2 | 193 |
endif |
194 |
||
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
195 |
ifndef BUILD_CLIENT_ONLY |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
196 |
# The conditional can be removed when import JDKs contain these files. |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
197 |
ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)),) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
198 |
IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
199 |
else |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
200 |
$(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME) not found!) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
201 |
endif |
2 | 202 |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
203 |
# The conditional can be removed when import JDKs contain these files. |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
204 |
ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)),) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
205 |
IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
206 |
else |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
207 |
$(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME) not found!) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
208 |
endif |
2 | 209 |
endif |
210 |
||
211 |
# For backwards compatability, make a link of the 32-bit client JVM to $(LIBDIR) |
|
212 |
IMPORT_LIST += $(LIB_LOCATION)/$(JVM_NAME) |
|
213 |
||
214 |
$(LIB_LOCATION)/$(JVM_NAME): $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME) |
|
215 |
@$(prep-target) |
|
216 |
||
217 |
# solaris ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ solaris |
|
218 |
endif # 32bit solaris |
|
219 |
||
220 |
endif # 32bit |
|
221 |
||
4111
ffc9c33335f4
6891677: java/build integrate zero assembler JDK changes
gbenson
parents:
3288
diff
changeset
|
222 |
endif # ZERO_BUILD |
ffc9c33335f4
6891677: java/build integrate zero assembler JDK changes
gbenson
parents:
3288
diff
changeset
|
223 |
|
2 | 224 |
# NOT Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ NOT Windows |
225 |
||
226 |
endif # PLATFORM |
|
227 |
||
228 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME) |
|
229 |
$(install-import-file) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
230 |
@$(call binary_file_verification,$@) |
2 | 231 |
|
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
232 |
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME) |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
233 |
$(install-file) |
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
234 |
@$(call binary_file_verification,$@) |
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
235 |
|
4062
203caeb1e9a8
6896472: Missing libjsig.so causes jdk build failure
ohair
parents:
3288
diff
changeset
|
236 |
$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_NAME) |
2 | 237 |
$(install-import-file) |
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
238 |
@$(call binary_file_verification,$@) |
2 | 239 |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
240 |
ifndef BUILD_CLIENT_ONLY |
2 | 241 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \ |
242 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME): |
|
243 |
@$(prep-target) |
|
4665
d14dc3d9e1fa
6911737: Module build: generate modules with native libraries and any other files not in jar
mchung
parents:
4340
diff
changeset
|
244 |
$(call install-sym-link, ../$(LIBJSIG_NAME)) |
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
245 |
else |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
246 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME): |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
247 |
@$(prep-target) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
248 |
$(call install-sym-link, ../$(LIBJSIG_NAME)) |
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
249 |
endif |
2 | 250 |
|
251 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME) |
|
252 |
$(install-import-file) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
253 |
@$(call binary_file_verification,$@) |
2 | 254 |
|
255 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_NAME) |
|
256 |
$(install-import-file) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
257 |
@$(call binary_file_verification,$@) |
2 | 258 |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
259 |
ifndef BUILD_CLIENT_ONLY |
2 | 260 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME) |
261 |
$(install-import-file) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
262 |
@$(call binary_file_verification,$@) |
2 | 263 |
|
264 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME) |
|
265 |
$(install-import-file) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
266 |
@$(call binary_file_verification,$@) |
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
267 |
endif |
2 | 268 |
|
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
269 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
270 |
$(install-import-file) |
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
271 |
@$(call binary_file_verification,$@) |
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
272 |
|
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
273 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
274 |
$(install-import-file) |
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
275 |
@$(call binary_file_verification,$@) |
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
276 |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
277 |
ifndef BUILD_CLIENT_ONLY |
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
278 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
279 |
$(install-import-file) |
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
280 |
@$(call binary_file_verification,$@) |
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
281 |
|
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
282 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME) |
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
283 |
$(install-import-file) |
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
284 |
@$(call binary_file_verification,$@) |
6378
5c7242a0a4a5
6983225: libjvm_db.so is not imported into solaris-x86 builds, and libjvm_dtrace.so not imported at all.
kamg
parents:
5506
diff
changeset
|
285 |
|
2 | 286 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAME) |
287 |
$(install-import-file) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
288 |
@$(call binary_file_verification,$@) |
2 | 289 |
|
290 |
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt : $(HOTSPOT_SERVER_PATH)/Xusage.txt |
|
291 |
$(install-import-file) |
|
8792
cd1dceb2d665
7027897: Build support for client-VM only configurations
dholmes
parents:
8018
diff
changeset
|
292 |
endif |
2 | 293 |
|
294 |
$(LIB_LOCATION)/$(CLIENT_LOCATION)/Xusage.txt : $(HOTSPOT_CLIENT_PATH)/Xusage.txt |
|
295 |
$(install-import-file) |
|
296 |
||
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
297 |
$(LIB_LOCATION)/$(KERNEL_LOCATION)/Xusage.txt : $(HOTSPOT_KERNEL_PATH)/Xusage.txt |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
298 |
$(install-file) |
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2301
diff
changeset
|
299 |
|
2 | 300 |
# |
7666
7b994e3dd41d
7008723: Remove binary plugs creation and use from openjdk
ohair
parents:
6378
diff
changeset
|
301 |
# Specific to non-OpenJDK building |
2 | 302 |
# |
7666
7b994e3dd41d
7008723: Remove binary plugs creation and use from openjdk
ohair
parents:
6378
diff
changeset
|
303 |
ifndef OPENJDK |
2 | 304 |
|
305 |
INTERNAL_IMPORT_LIST += \ |
|
306 |
$(LIBDIR)/security/US_export_policy.jar \ |
|
307 |
$(LIBDIR)/security/local_policy.jar \ |
|
308 |
$(LIBDIR)/jce.jar |
|
309 |
||
310 |
$(LIBDIR)/jce.jar: \ |
|
311 |
$(BUILDDIR)/closed/tools/crypto/jce/jce.jar |
|
8583
15dea0fdc2ea
7025631: Remove the modules build support from jdk 7
mchung
parents:
8018
diff
changeset
|
312 |
$(install-file) |
2 | 313 |
$(LIBDIR)/security/US_export_policy.jar: \ |
314 |
$(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar |
|
315 |
$(install-file) |
|
316 |
$(LIBDIR)/security/local_policy.jar: \ |
|
317 |
$(BUILDDIR)/closed/tools/crypto/jce/local_policy.jar |
|
318 |
$(install-file) |
|
319 |
||
320 |
endif # OPENJDK |
|
321 |
||
322 |
ADDJSUM_JARFILE = $(BUILDTOOLJARDIR)/addjsum.jar |
|
323 |
||
324 |
# Construct classlist file |
|
325 |
$(LIBDIR)/classlist: \ |
|
326 |
$(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) \ |
|
327 |
$(ADDJSUM_JARFILE) |
|
328 |
@$(prep-target) |
|
329 |
@$(RM) -f $@.temp |
|
330 |
$(BOOT_JAVA_CMD) -jar $(ADDJSUM_JARFILE) \ |
|
331 |
$(CLASSSHARINGDATA_DIR)/classlist.$(PLATFORM) $@.temp |
|
332 |
$(MV) $@.temp $@ |
|
333 |
||
334 |
# Import internal files (ones that are stashed in this source tree) |
|
335 |
import_internal_files : $(INTERNAL_IMPORT_LIST) |
|
336 |
||
337 |
# Import files from the JDK that we are not building |
|
338 |
import_files: $(IMPORT_LIST) |
|
339 |
||
340 |
# Get component information variables and rules |
|
341 |
include $(BUILDDIR)/common/internal/ImportComponents.gmk |
|
342 |
||
343 |
# Security files we need to import |
|
344 |
SEC_FILES_ZIP=$(ABS_BUILDDIR)/tools/crypto/sec-bin.zip |
|
345 |
SEC_FILES_WIN_ZIP=$(ABS_BUILDDIR)/tools/crypto/sec-windows-bin.zip |
|
346 |
JGSS_WIN32_FILES_ZIP=$(ABS_BUILDDIR)/tools/crypto/jgss-windows-i586-bin.zip |
|
347 |
JGSS_WIN64_FILES_ZIP=$(ABS_BUILDDIR)/tools/crypto/jgss-windows-x64-bin.zip |
|
348 |
||
349 |
# Unzip zip file $2 into directory $1 (if $2 exists) |
|
350 |
# Warning: $2 must be absolute path not relative |
|
351 |
define SecUnzipper |
|
352 |
if [ -f $2 ] ; then \ |
|
353 |
$(MKDIR) -p $1; \ |
|
354 |
$(ECHO) "( $(CD) $1 && $(UNZIP) -o $2 )"; \ |
|
355 |
( $(CD) $1 && $(UNZIP) -o $2 ); \ |
|
356 |
fi |
|
357 |
endef |
|
358 |
||
359 |
# If sec-bin exists, unpack it into the build directory |
|
360 |
# Also, the library recompile build indirectly depends on two SSL classes, |
|
361 |
# so copy those as well FIXUP |
|
362 |
# if sec-windows-bin exists, unpack it into the build directory |
|
363 |
# if JGSS files exists, unpack it into the build directory |
|
364 |
$(TEMPDIR)/security_imported: |
|
365 |
@$(prep-target) |
|
366 |
@$(call SecUnzipper,$(OUTPUTDIR),$(SEC_FILES_ZIP)) |
|
367 |
ifeq ($(PLATFORM), windows) |
|
368 |
@$(call SecUnzipper,$(OUTPUTDIR),$(SEC_FILES_WIN_ZIP)) |
|
369 |
endif |
|
370 |
ifeq ($(PLATFORM), windows) |
|
371 |
ifeq ($(ARCH_DATA_MODEL), 32) |
|
372 |
@$(call SecUnzipper,$(OUTPUTDIR),$(JGSS_WIN32_FILES_ZIP)) |
|
373 |
else |
|
374 |
@$(call SecUnzipper,$(OUTPUTDIR),$(JGSS_WIN64_FILES_ZIP)) |
|
375 |
endif |
|
376 |
endif |
|
377 |
@$(ECHO) "Imported on `$(DATE)`" > $@ |
|
378 |
||
379 |
# Import all files from other components |
|
380 |
$(TEMPDIR)/components_imported: |
|
381 |
@$(prep-target) |
|
382 |
$(call import-component-binaries,$(ABS_OUTPUTDIR)) |
|
383 |
$(call import-component-sources,$(IMPORTSRCDIR)) |
|
384 |
$(call import-component-docs,$(IMPORTDOCDIR)) |
|
385 |
$(call import-component-classes,$(CLASSDESTDIR)) |
|
386 |
@$(ECHO) "Imported on `$(DATE)`" > $@ |
|
387 |
||
388 |
# Do pretty much everything |
|
389 |
build : import_files \ |
|
390 |
import_internal_files \ |
|
391 |
$(TEMPDIR)/components_imported \ |
|
392 |
$(TEMPDIR)/security_imported |
|
393 |
||
394 |
# Clean up what we imported (except for component files) |
|
395 |
clean clobber:: |
|
396 |
$(RM) $(IMPORT_LIST) |
|
397 |
$(RM) $(INTERNAL_IMPORT_LIST) |
|
398 |
$(call import-component-sources-clean,$(IMPORTSRCDIR)) |
|
399 |
$(call import-component-docs-clean,$(IMPORTDOCDIR)) |
|
400 |
$(call import-component-classes-clean,$(CLASSDESTDIR)) |
|
401 |
$(RM) $(TEMPDIR)/components_imported |
|
402 |
$(RM) $(TEMPDIR)/security_imported |
|
403 |
||
404 |
.PHONY: import_files import_internal_files |
|
405 |