| author | ohair |
| Tue, 29 Mar 2011 11:29:01 -0700 | |
| changeset 8827 | f0f30d988312 |
| parent 8694 | 6e5584652aea |
| child 8828 | fb3ae88d8e8d |
| permissions | -rw-r--r-- |
| 2 | 1 |
# |
|
8694
6e5584652aea
7029704: JFB: Refix JFB Custom Revision Version Build/Makefile changes
asaha
parents:
8588
diff
changeset
|
2 |
# Copyright (c) 1997, 2011, 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 |
include $(JDK_TOPDIR)/make/docs/CORE_PKGS.gmk |
|
27 |
include $(JDK_TOPDIR)/make/docs/NON_CORE_PKGS.gmk |
|
28 |
||
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
29 |
# What jdk version are we building |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
30 |
THIS_JDK_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
31 |
|
| 2 | 32 |
# |
33 |
# Perform release engineering tasks. |
|
34 |
# |
|
35 |
# images An image is what the product looks like when it is |
|
36 |
# installed. |
|
37 |
# |
|
38 |
||
39 |
IMAGE_BINDIR = bin |
|
40 |
||
41 |
# The compiler should not issue a "Sun Propietary" warning when compiling |
|
42 |
# classes in the com.sun.java.swing.plaf packages, since we've always |
|
43 |
# allowed, and even advocated, extending them (see bug 6476749). |
|
44 |
# |
|
45 |
# This approach is NOT to be used as a general purpose way to avoid such |
|
46 |
# compiler warnings for non-core packages. The correct way is to document |
|
47 |
# the packages in NON_CORE_PKGS.gmk, and include them in the NON_CORE_PKGS |
|
48 |
# definition. |
|
49 |
# |
|
50 |
# Swing has taken this approach only as a temporary measure to avoid |
|
51 |
# the compiler warnings until we can properly document these packages. |
|
52 |
# This is covered under 6491853. |
|
|
5593
b89c8108f831
6929507: Build error on file swing.plaf.synth.SynthUI
peterz
parents:
5381
diff
changeset
|
53 |
EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \ |
| 2 | 54 |
com.sun.java.swing.plaf.motif \ |
55 |
com.sun.java.swing.plaf.gtk |
|
56 |
||
| 2763 | 57 |
# This is a stopgap until 6839872 is fixed. |
58 |
EXCLUDE_PROPWARN_PKGS += sun.dyn |
|
59 |
||
|
5789
246b84dc50d9
6960789: com.sun.servicetag API needs to be added in ct.sym
mchung
parents:
5506
diff
changeset
|
60 |
# |
|
246b84dc50d9
6960789: com.sun.servicetag API needs to be added in ct.sym
mchung
parents:
5506
diff
changeset
|
61 |
# Include the exported private packages in ct.sym. |
|
246b84dc50d9
6960789: com.sun.servicetag API needs to be added in ct.sym
mchung
parents:
5506
diff
changeset
|
62 |
# This is an interim solution until the ct.sym is replaced |
|
8583
15dea0fdc2ea
7025631: Remove the modules build support from jdk 7
mchung
parents:
8461
diff
changeset
|
63 |
# with a new module system (being discussed for JDK 8). |
|
5789
246b84dc50d9
6960789: com.sun.servicetag API needs to be added in ct.sym
mchung
parents:
5506
diff
changeset
|
64 |
# |
|
8586
2ca53fa2d6e9
6908562: JFB Custom Revision Version Build/Makefile changes
asaha
parents:
8461
diff
changeset
|
65 |
EXPORTED_PRIVATE_PKGS = com.sun.servicetag \ |
|
2ca53fa2d6e9
6908562: JFB Custom Revision Version Build/Makefile changes
asaha
parents:
8461
diff
changeset
|
66 |
com.oracle.net |
|
5789
246b84dc50d9
6960789: com.sun.servicetag API needs to be added in ct.sym
mchung
parents:
5506
diff
changeset
|
67 |
|
| 2 | 68 |
# 64-bit solaris has a few special cases. We define the variable |
69 |
# SOLARIS64 for use in this Makefile to easily test those cases |
|
70 |
ifeq ($(PLATFORM), solaris) |
|
71 |
ifeq ($(ARCH_DATA_MODEL), 64) |
|
72 |
SOLARIS64 = true |
|
73 |
IMAGE_BINDIR = bin/$(ARCH) |
|
74 |
endif |
|
75 |
endif |
|
76 |
||
77 |
JTG_DOCS = $(JDK_TOPDIR)/src/solaris/doc |
|
78 |
||
79 |
# The base names of all the license and document files for the jdk and jre |
|
|
920
e455938eb00c
6734977: Fix build failure regarding the now deleted file jdk/README.html
ohair
parents:
715
diff
changeset
|
80 |
# (These files get placed in the jdk and jre install images) |
| 2 | 81 |
ifdef OPENJDK |
|
920
e455938eb00c
6734977: Fix build failure regarding the now deleted file jdk/README.html
ohair
parents:
715
diff
changeset
|
82 |
# Where to find these files |
|
e455938eb00c
6734977: Fix build failure regarding the now deleted file jdk/README.html
ohair
parents:
715
diff
changeset
|
83 |
SHARE_JDK_DOC_SRC = $(JDK_TOPDIR) |
|
e455938eb00c
6734977: Fix build failure regarding the now deleted file jdk/README.html
ohair
parents:
715
diff
changeset
|
84 |
SHARE_JRE_DOC_SRC = $(JDK_TOPDIR) |
| 2 | 85 |
# Same files for jdk and jre, no name changes |
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
86 |
IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
|
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
87 |
IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
| 2 | 88 |
else |
|
8694
6e5584652aea
7029704: JFB: Refix JFB Custom Revision Version Build/Makefile changes
asaha
parents:
8588
diff
changeset
|
89 |
# make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC |
|
8586
2ca53fa2d6e9
6908562: JFB Custom Revision Version Build/Makefile changes
asaha
parents:
8461
diff
changeset
|
90 |
|
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
91 |
IMAGE_DOCLIST_JDK = COPYRIGHT README.html THIRDPARTYLICENSEREADME.txt |
|
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
92 |
IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt |
| 2 | 93 |
ifeq ($(PLATFORM), windows) |
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
94 |
IMAGE_DOCLIST_JRE += README.txt |
| 2 | 95 |
else |
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
96 |
IMAGE_DOCLIST_JRE += README |
| 2 | 97 |
endif |
98 |
endif |
|
99 |
||
100 |
# Paths to these files we need |
|
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
101 |
JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%) |
|
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
102 |
JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%) |
| 2 | 103 |
|
104 |
# absolute directory names: note, these must exist prior to build |
|
105 |
# time - they are created in the main Makefile. |
|
106 |
JRE_IMAGE_BINDIR = $(JRE_IMAGE_DIR)/bin |
|
107 |
||
108 |
MAINMANIFEST = $(JDK_TOPDIR)/make/tools/manifest.mf |
|
109 |
BEANMANIFEST = $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest |
|
110 |
||
111 |
# |
|
112 |
# Man pages |
|
113 |
# |
|
114 |
||
115 |
JRE_MAN_PAGES = \ |
|
116 |
java.1 \ |
|
117 |
keytool.1 \ |
|
118 |
orbd.1 \ |
|
119 |
pack200.1 \ |
|
120 |
policytool.1 \ |
|
121 |
rmid.1 \ |
|
122 |
rmiregistry.1 \ |
|
123 |
servertool.1 \ |
|
124 |
tnameserv.1 \ |
|
125 |
unpack200.1 |
|
126 |
||
| 8270 | 127 |
ifndef OPENJDK |
| 2 | 128 |
JRE_MAN_PAGES += javaws.1 |
129 |
endif |
|
130 |
||
131 |
JDK_MAN_PAGES = \ |
|
132 |
$(JRE_MAN_PAGES) \ |
|
133 |
appletviewer.1 \ |
|
134 |
apt.1 \ |
|
135 |
extcheck.1 \ |
|
136 |
idlj.1 \ |
|
137 |
jar.1 \ |
|
138 |
jarsigner.1 \ |
|
139 |
javac.1 \ |
|
140 |
javadoc.1 \ |
|
141 |
javah.1 \ |
|
142 |
javap.1 \ |
|
143 |
jconsole.1 \ |
|
144 |
jdb.1 \ |
|
145 |
jhat.1 \ |
|
146 |
jinfo.1 \ |
|
147 |
jmap.1 \ |
|
148 |
jps.1 \ |
|
149 |
jrunscript.1 \ |
|
150 |
jsadebugd.1 \ |
|
151 |
jstack.1 \ |
|
152 |
jstat.1 \ |
|
153 |
jstatd.1 \ |
|
154 |
native2ascii.1 \ |
|
155 |
rmic.1 \ |
|
156 |
schemagen.1 \ |
|
157 |
serialver.1 \ |
|
158 |
wsgen.1 \ |
|
159 |
wsimport.1 \ |
|
160 |
xjc.1 |
|
161 |
||
162 |
ifeq ($(PLATFORM), solaris) |
|
163 |
MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR) |
|
164 |
MAN1SUBDIR=sun/man/man1 |
|
165 |
endif # solaris |
|
166 |
||
167 |
ifeq ($(PLATFORM), linux) |
|
168 |
MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR) |
|
169 |
MAN1SUBDIR=man |
|
170 |
JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING) |
|
171 |
endif # linux |
|
172 |
||
173 |
define copy-man-pages |
|
174 |
$(MKDIR) -p $1/man/man1 |
|
175 |
for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \ |
|
176 |
for manpage in $2; do \ |
|
177 |
if [ -f $${manbase}/$${manpage} ] ; then \
|
|
178 |
$(CP) $${manbase}/$${manpage} $1/man/man1 ; \
|
|
179 |
for ja_encoding in $(JA_TARGET_ENCODINGS); do \ |
|
180 |
ja_dir="ja"; \ |
|
181 |
if [ "$${ja_encoding}" != "$(JA_SOURCE_ENCODING)" ]; then \
|
|
182 |
ja_dir="ja_JP.$${ja_encoding}"; \
|
|
183 |
fi; \ |
|
184 |
$(MKDIR) -p $1/man/$${ja_dir}/man1; \
|
|
185 |
$(CAT) $${manbase}/ja/$${manpage} \
|
|
186 |
| $(NATIVE2ASCII) -encoding $(JA_SOURCE_ENCODING) \ |
|
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
187 |
| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \ |
| 2 | 188 |
| $(NATIVE2ASCII) -reverse -encoding $${ja_encoding} \
|
189 |
> $1/man/$${ja_dir}/man1/$${manpage}; \
|
|
190 |
done; \ |
|
191 |
fi; \ |
|
192 |
done; \ |
|
193 |
done |
|
194 |
$(java-vm-cleanup) |
|
195 |
if [ "$(JA_DIRNAME)" != "" ] ; then \ |
|
196 |
$(MV) $1/man/ja $1/man/$(JA_DIRNAME); \ |
|
197 |
$(CD) $1/man && $(LN) -s $(JA_DIRNAME) ja; \ |
|
198 |
fi |
|
199 |
endef |
|
200 |
||
201 |
# |
|
202 |
# Targets. |
|
203 |
# |
|
204 |
INITIAL_IMAGE_JRE=initial-image-jre |
|
205 |
INITIAL_IMAGE_JDK=initial-image-jdk |
|
206 |
ifeq ($(PLATFORM), solaris) |
|
207 |
ifeq ($(ARCH_DATA_MODEL), 64) |
|
208 |
INITIAL_IMAGE_JRE=initial-image-jre-sol64 |
|
209 |
INITIAL_IMAGE_JDK=initial-image-jdk-sol64 |
|
210 |
endif |
|
211 |
endif |
|
212 |
||
213 |
images images-clobber \ |
|
214 |
initial-image-jre initial-image-jdk \ |
|
215 |
initial-image-jre-sol64 initial-image-jdk-sol64 \ |
|
216 |
trim-image-jre trim-image-jdk \ |
|
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
217 |
identify-image-jre identify-image-jdk \ |
| 2 | 218 |
process-image-jre process-image-jdk \ |
219 |
compare-image \ |
|
220 |
sec-files sec-files-win jgss-files :: |
|
221 |
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..." |
|
222 |
||
223 |
# Order is important here, trim jre after jdk image is created |
|
224 |
images:: sanity-images post-sanity-images \ |
|
225 |
$(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \ |
|
226 |
trim-image-jre trim-image-jdk \ |
|
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
227 |
identify-image-jre identify-image-jdk \ |
| 2 | 228 |
process-image-jre process-image-jdk sec-files sec-files-win jgss-files |
229 |
||
230 |
# Don't use these |
|
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
231 |
image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
232 |
image-jdk:: initial-image-jdk trim-image-jdk identify-image-jdk process-image-jdk |
| 2 | 233 |
|
234 |
# |
|
235 |
# Sources we ship in the SDK. |
|
236 |
# |
|
237 |
SOURCES = \ |
|
238 |
java/applet \ |
|
239 |
java/awt \ |
|
240 |
java/beans \ |
|
241 |
java/io \ |
|
242 |
java/lang \ |
|
243 |
java/math \ |
|
244 |
java/net \ |
|
245 |
java/nio \ |
|
246 |
java/rmi \ |
|
247 |
java/security \ |
|
248 |
java/sql \ |
|
249 |
java/text \ |
|
250 |
java/util \ |
|
251 |
com/sun/corba \ |
|
252 |
com/sun/image/codec/jpeg \ |
|
253 |
com/sun/imageio \ |
|
254 |
com/sun/java/swing \ |
|
255 |
com/sun/javadoc \ |
|
256 |
com/sun/jmx \ |
|
257 |
com/sun/mirror \ |
|
258 |
com/sun/source \ |
|
259 |
com/sun/naming \ |
|
260 |
com/sun/security/auth \ |
|
261 |
com/sun/security/jgss \ |
|
262 |
javax/accessibility \ |
|
263 |
javax/annotation \ |
|
264 |
javax/script \ |
|
265 |
javax/imageio \ |
|
266 |
javax/lang \ |
|
267 |
javax/management \ |
|
268 |
javax/naming \ |
|
269 |
javax/print \ |
|
270 |
javax/rmi \ |
|
271 |
javax/security \ |
|
272 |
javax/sound \ |
|
273 |
javax/sql \ |
|
274 |
javax/swing \ |
|
275 |
javax/tools \ |
|
276 |
javax/xml \ |
|
277 |
com/sun/org/apache \ |
|
278 |
com/sun/java_cup \ |
|
279 |
com/sun/jlex \ |
|
280 |
org/ietf \ |
|
281 |
org/omg \ |
|
282 |
org/w3c/dom \ |
|
283 |
org/xml/sax \ |
|
284 |
sunw |
|
285 |
# |
|
286 |
# Directories where sources may be found. If a file with the same path |
|
287 |
# name exists in more than one of these places, the one found last on this |
|
288 |
# list wins. |
|
289 |
# |
|
290 |
SOURCE_DIRS = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes |
|
291 |
SOURCE_DIRS += $(GENSRCDIR) |
|
292 |
SOURCE_DIRS += $(IMPORTSRCDIR) |
|
293 |
ifndef OPENJDK |
|
294 |
SOURCE_DIRS += $(CLOSED_SRC)/share/classes |
|
295 |
endif |
|
296 |
||
297 |
||
298 |
# |
|
299 |
# Specific files and directories that will be filtered out from above areas. |
|
300 |
# |
|
|
4115
e09be02771b6
6888701: Change all template java source files to a .java-template file suffix
ohair
parents:
3288
diff
changeset
|
301 |
SOURCE_FILTERs = $(SCM_DIRs) ',*' |
| 2 | 302 |
SOURCE_FILES_filter = $(SOURCE_FILTERs:%=-name % -prune -o) |
303 |
||
304 |
# |
|
305 |
# Bug 4249883 - excluding some unnecessary packages from com.sun.tools |
|
306 |
# |
|
307 |
# Bug 5008685 - exclude jconsole from sun/tools |
|
308 |
# |
|
309 |
TOOLS = \ |
|
310 |
META-INF/services/com.sun.jdi.connect.Connector \ |
|
311 |
META-INF/services/com.sun.jdi.connect.spi.TransportService \ |
|
312 |
sun/tools/asm \ |
|
313 |
sun/tools/jar \ |
|
314 |
sun/tools/java \ |
|
315 |
sun/tools/javac \ |
|
316 |
sun/tools/jps \ |
|
317 |
sun/tools/jstat \ |
|
318 |
sun/tools/jstatd \ |
|
319 |
sun/tools/native2ascii \ |
|
320 |
sun/tools/serialver \ |
|
321 |
sun/tools/tree \ |
|
322 |
sun/tools/util \ |
|
323 |
sun/security/tools/JarBASE64Encoder.class \ |
|
324 |
sun/security/tools/JarSigner.class \ |
|
325 |
sun/security/tools/JarSignerParameters.class \ |
|
326 |
sun/security/tools/JarSignerResources.class \ |
|
327 |
sun/security/tools/JarSignerResources_ja.class \ |
|
328 |
sun/security/tools/JarSignerResources_zh_CN.class \ |
|
329 |
sun/security/tools/SignatureFile\$$Block.class \ |
|
330 |
sun/security/tools/SignatureFile.class \ |
|
331 |
sun/security/tools/TimestampedSigner.class \ |
|
332 |
sun/rmi/rmic \ |
|
333 |
sun/applet \ |
|
334 |
sun/jvmstat \ |
|
335 |
com/sun/javadoc \ |
|
336 |
com/sun/jdi \ |
|
337 |
com/sun/jarsigner \ |
|
338 |
com/sun/mirror \ |
|
339 |
com/sun/source \ |
|
| 684 | 340 |
com/sun/tools/classfile \ |
| 2 | 341 |
com/sun/tools/doclets \ |
342 |
com/sun/tools/example/debug/expr \ |
|
343 |
com/sun/tools/example/debug/tty \ |
|
344 |
com/sun/tools/extcheck \ |
|
345 |
com/sun/tools/hat \ |
|
346 |
com/sun/tools/javac \ |
|
347 |
com/sun/tools/javadoc \ |
|
348 |
com/sun/tools/apt \ |
|
349 |
com/sun/tools/javah \ |
|
| 684 | 350 |
com/sun/tools/javap \ |
| 2 | 351 |
com/sun/tools/corba \ |
352 |
com/sun/tools/internal/xjc \ |
|
353 |
com/sun/tools/internal/ws \ |
|
354 |
META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \ |
|
355 |
META-INF/services/com.sun.tools.xjc.Plugin \ |
|
356 |
com/sun/istack/internal/tools \ |
|
357 |
com/sun/istack/internal/ws \ |
|
358 |
com/sun/codemodel \ |
|
359 |
com/sun/tools/internal/jxc \ |
|
360 |
com/sun/xml/internal/rngom \ |
|
361 |
com/sun/xml/internal/xsom \ |
|
362 |
org/relaxng/datatype \ |
|
363 |
com/sun/xml/internal/dtdparser \ |
|
364 |
com/sun/tools/jdi \ |
|
365 |
com/sun/tools/script/shell \ |
|
366 |
META-INF/services/com.sun.tools.attach.spi.AttachProvider \ |
|
367 |
com/sun/tools/attach \ |
|
368 |
sun/tools/attach \ |
|
369 |
sun/tools/jstack \ |
|
370 |
sun/tools/jinfo \ |
|
371 |
sun/tools/jmap |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
372 |
|
| 2 | 373 |
# classes that go into jsse.jar |
374 |
JSSE_CLASSES_DIRS = \ |
|
375 |
sun/security/provider/Sun.class \ |
|
376 |
sun/security/rsa/SunRsaSign.class \ |
|
377 |
sun/security/ssl \ |
|
378 |
com/sun/net/ssl/internal/ssl |
|
379 |
||
380 |
# files under $(OUTPUTDIR) that need to go into sec-bin.zip for builds |
|
381 |
# where the corresponding sources are not available |
|
382 |
SEC_FILES_DIRS = \ |
|
383 |
classes/javax/net \ |
|
384 |
classes/javax/security/cert \ |
|
385 |
classes/com/sun/net/ssl \ |
|
386 |
classes/com/sun/security/cert \ |
|
387 |
classes/sun/net/www/protocol/https \ |
|
388 |
classes/sun/security/pkcs12 \ |
|
389 |
classes/sun/security/ssl \ |
|
390 |
classes/sun/security/krb5/*.class \ |
|
391 |
classes/sun/security/krb5/internal/*.class \ |
|
392 |
classes/sun/security/krb5/internal/ccache \ |
|
393 |
classes/sun/security/krb5/internal/crypto \ |
|
394 |
classes/sun/security/krb5/internal/ktab \ |
|
395 |
classes/sun/security/krb5/internal/rcache \ |
|
396 |
classes/sun/security/krb5/internal/util \ |
|
397 |
classes/sun/security/jgss/spi/GSSContextSpi.class |
|
398 |
||
399 |
# files under $(OUTPUTDIR) that need to go into sec-windows-win.zip for builds |
|
400 |
# where the corresponding sources are not available |
|
401 |
SEC_FILES_WIN_DIRS = \ |
|
402 |
classes/sun/security/krb5/internal/tools |
|
403 |
||
404 |
# files under $(BINDIR) that need to go into jgss_files.zip for builds |
|
405 |
# where the corresponding sources are not available |
|
406 |
JGSS_FILES_DIRS = \ |
|
407 |
bin/w2k_lsa_auth.dll \ |
|
408 |
bin/w2k_lsa_auth.map \ |
|
409 |
bin/w2k_lsa_auth.pdb |
|
410 |
||
411 |
# The following get removed from the SDK image. |
|
412 |
NOTJDKTOOLS = \ |
|
413 |
java_vm |
|
414 |
||
415 |
# The following get removed from the JRE after the bulk-copy of BINDIR... |
|
416 |
NOTJRETOOLS = \ |
|
417 |
appletviewer$(EXE_SUFFIX) \ |
|
418 |
extcheck$(EXE_SUFFIX) \ |
|
419 |
idlj$(EXE_SUFFIX) \ |
|
420 |
jar$(EXE_SUFFIX) \ |
|
421 |
jarsigner$(EXE_SUFFIX) \ |
|
422 |
java-rmi.cgi \ |
|
423 |
javac$(EXE_SUFFIX) \ |
|
424 |
javadoc$(EXE_SUFFIX) \ |
|
425 |
apt$(EXE_SUFFIX) \ |
|
426 |
javah$(EXE_SUFFIX) \ |
|
427 |
javap$(EXE_SUFFIX) \ |
|
428 |
jdb$(EXE_SUFFIX) \ |
|
429 |
jps$(EXE_SUFFIX) \ |
|
430 |
jrunscript$(EXE_SUFFIX) \ |
|
431 |
jstat$(EXE_SUFFIX) \ |
|
432 |
jstatd$(EXE_SUFFIX) \ |
|
433 |
jstack$(EXE_SUFFIX) \ |
|
434 |
packagebean$(SCRIPT_SUFFIX) \ |
|
435 |
rmic$(EXE_SUFFIX) \ |
|
436 |
serialver$(EXE_SUFFIX) \ |
|
437 |
unregbean$(EXE_SUFFIX) \ |
|
438 |
jconsole$(EXE_SUFFIX) \ |
|
439 |
jinfo$(EXE_SUFFIX) \ |
|
440 |
jmap$(EXE_SUFFIX) \ |
|
441 |
native2ascii$(EXE_SUFFIX) \ |
|
442 |
xjc$(EXE_SUFFIX) \ |
|
443 |
wsgen$(EXE_SUFFIX) \ |
|
444 |
wsimport$(EXE_SUFFIX) \ |
|
445 |
schemagen$(EXE_SUFFIX) \ |
|
446 |
jsadebugd$(EXE_SUFFIX) \ |
|
447 |
jhat$(EXE_SUFFIX) |
|
448 |
||
449 |
# The following get removed from the JRE after the bulk-copy of LIBDIR... |
|
450 |
NOTJRELIBS = tools.jar \ |
|
451 |
jconsole.jar |
|
452 |
||
453 |
ifeq ($(INCLUDE_SA), true) |
|
454 |
NOTJRELIBS += sa-jdi.jar |
|
455 |
||
456 |
# The following get removed from the JRE after the bulk-copy of LIBDIR... |
|
457 |
NOTJRE_SHARED_LIBS = $(SALIB_NAME) |
|
458 |
else |
|
459 |
NOTJRE_SHARED_LIBS = |
|
460 |
endif |
|
461 |
||
462 |
# Attach library is JDK only |
|
463 |
NOTJRE_SHARED_LIBS += $(LIB_PREFIX)attach.$(LIBRARY_SUFFIX) |
|
464 |
||
465 |
# |
|
466 |
###### RULES |
|
467 |
||
468 |
# Processing license files from source area to image area |
|
469 |
# These will be modified to have the platform specific EOL chars. |
|
470 |
define process-doc-file |
|
471 |
$(prep-target) |
|
472 |
$(SED) 's/$$//g' $< > $@ |
|
473 |
$(CHMOD) 444 $@ |
|
474 |
endef |
|
475 |
||
476 |
# JDK files |
|
477 |
$(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/% |
|
478 |
$(process-doc-file) |
|
479 |
||
480 |
# JRE files |
|
481 |
$(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/% |
|
482 |
$(process-doc-file) |
|
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
483 |
ifeq ($(PLATFORM), windows) |
|
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
484 |
$(JRE_IMAGE_DIR)/README.txt: $(SHARE_JRE_DOC_SRC)/README |
| 2 | 485 |
$(process-doc-file) |
486 |
endif |
|
487 |
||
488 |
# Differences tool |
|
489 |
DIRDIFF_JARFILE = $(BUILDTOOLJARDIR)/dirdiff.jar |
|
490 |
||
491 |
###################################################### |
|
492 |
# List of directories in classes directory that should NOT be in rt.jar |
|
493 |
###################################################### |
|
494 |
||
495 |
NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_jar.list |
|
496 |
||
497 |
$(NOT_RT_JAR_LIST): FRC |
|
498 |
$(prep-target) |
|
499 |
$(ECHO) "#\n" >> $@ |
|
500 |
$(ECHO) "# List of subdirectories not in include in rt.jar" >> $@ |
|
501 |
$(ECHO) "# Directories must contain trailing '/'." >> $@ |
|
502 |
$(ECHO) "com/sun/javadoc/" >> $@ |
|
503 |
$(ECHO) "com/sun/jdi/" >> $@ |
|
504 |
$(ECHO) "com/sun/jarsigner/" >> $@ |
|
505 |
$(ECHO) "com/sun/mirror/" >> $@ |
|
506 |
$(ECHO) "com/sun/source/" >> $@ |
|
507 |
$(ECHO) "com/sun/istack/internal/tools/" >> $@ |
|
508 |
$(ECHO) "com/sun/istack/internal/ws/" >> $@ |
|
509 |
$(ECHO) "META-INF/services/com.sun.jdi.connect.Connector" >> $@ |
|
510 |
$(ECHO) "META-INF/services/com.sun.jdi.connect.spi.TransportService" >> $@ |
|
511 |
$(ECHO) "META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory" >> $@ |
|
512 |
$(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@ |
|
513 |
$(ECHO) "com/sun/tools/" >> $@ |
|
514 |
$(ECHO) "sun/jvmstat/" >> $@ |
|
|
6111
48902dd9b4d7
6964313: Find sun/nio/cs/ext issue with CreateSymbols, then move sun/nio/cs/ext to charset.jar
sherman
parents:
5976
diff
changeset
|
515 |
$(ECHO) "sun/nio/cs/ext/" >> $@ |
|
48902dd9b4d7
6964313: Find sun/nio/cs/ext issue with CreateSymbols, then move sun/nio/cs/ext to charset.jar
sherman
parents:
5976
diff
changeset
|
516 |
$(ECHO) "sun/awt/HKSCS.class" >> $@ |
|
6532
46e43203603e
6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar
alanb
parents:
6111
diff
changeset
|
517 |
$(ECHO) "sun/awt/motif/X11GB2312\$$Decoder.class" >> $@ |
|
46e43203603e
6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar
alanb
parents:
6111
diff
changeset
|
518 |
$(ECHO) "sun/awt/motif/X11GB2312\$$Encoder.class" >> $@ |
|
6111
48902dd9b4d7
6964313: Find sun/nio/cs/ext issue with CreateSymbols, then move sun/nio/cs/ext to charset.jar
sherman
parents:
5976
diff
changeset
|
519 |
$(ECHO) "sun/awt/motif/X11GB2312.class" >> $@ |
|
6532
46e43203603e
6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar
alanb
parents:
6111
diff
changeset
|
520 |
$(ECHO) "sun/awt/motif/X11GBK\$$Encoder.class" >> $@ |
|
6111
48902dd9b4d7
6964313: Find sun/nio/cs/ext issue with CreateSymbols, then move sun/nio/cs/ext to charset.jar
sherman
parents:
5976
diff
changeset
|
521 |
$(ECHO) "sun/awt/motif/X11GBK.class" >> $@ |
|
6532
46e43203603e
6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar
alanb
parents:
6111
diff
changeset
|
522 |
$(ECHO) "sun/awt/motif/X11KSC5601\$$Decoder.class" >> $@ |
|
46e43203603e
6971706: sun/nio/cs/ext/* classes are duplicated between rt.jar, charsets.jar, and localedata.jar
alanb
parents:
6111
diff
changeset
|
523 |
$(ECHO) "sun/awt/motif/X11KSC5601\$$Encoder.class" >> $@ |
|
6111
48902dd9b4d7
6964313: Find sun/nio/cs/ext issue with CreateSymbols, then move sun/nio/cs/ext to charset.jar
sherman
parents:
5976
diff
changeset
|
524 |
$(ECHO) "sun/awt/motif/X11KSC5601.class" >> $@ |
| 2 | 525 |
$(ECHO) "sun/rmi/rmic/" >> $@ |
526 |
$(ECHO) "sun/tools/asm/" >> $@ |
|
527 |
$(ECHO) "sun/tools/java/" >> $@ |
|
528 |
$(ECHO) "sun/tools/javac/" >> $@ |
|
| 684 | 529 |
$(ECHO) "com/sun/tools/classfile/" >> $@ |
530 |
$(ECHO) "com/sun/tools/javap/" >> $@ |
|
| 2 | 531 |
$(ECHO) "sun/tools/jconsole/" >> $@ |
532 |
$(ECHO) "sun/tools/jps/" >> $@ |
|
533 |
$(ECHO) "sun/tools/jstat/" >> $@ |
|
534 |
$(ECHO) "sun/tools/jstatd/" >> $@ |
|
535 |
$(ECHO) "sun/tools/native2ascii/" >> $@ |
|
536 |
$(ECHO) "sun/tools/serialver/" >> $@ |
|
537 |
$(ECHO) "sun/tools/tree/" >> $@ |
|
538 |
$(ECHO) "sun/tools/util/" >> $@ |
|
539 |
$(ECHO) "sun/security/tools/JarBASE64Encoder.class" >> $@ |
|
540 |
$(ECHO) "sun/security/tools/JarSigner.class" >> $@ |
|
541 |
$(ECHO) "sun/security/tools/JarSignerParameters.class" >> $@ |
|
542 |
$(ECHO) "sun/security/tools/JarSignerResources.class" >> $@ |
|
543 |
$(ECHO) "sun/security/tools/JarSignerResources_ja.class" >> $@ |
|
544 |
$(ECHO) "sun/security/tools/JarSignerResources_zh_CN.class" >> $@ |
|
545 |
$(ECHO) "sun/security/tools/SignatureFile\$$Block.class" >> $@ |
|
546 |
$(ECHO) "sun/security/tools/SignatureFile.class" >> $@ |
|
547 |
$(ECHO) "sun/security/tools/TimestampedSigner.class" >> $@ |
|
548 |
$(ECHO) "sun/security/provider/Sun.class" >> $@ |
|
549 |
$(ECHO) "sun/security/rsa/SunRsaSign.class" >> $@ |
|
550 |
$(ECHO) "sun/security/ssl/" >> $@ |
|
551 |
$(ECHO) "com/sun/net/ssl/internal/ssl/" >> $@ |
|
552 |
$(ECHO) "javax/crypto/" >> $@ |
|
553 |
$(ECHO) "sun/security/internal/" >> $@ |
|
554 |
$(ECHO) "com/sun/crypto/provider/" >> $@ |
|
555 |
$(ECHO) "META-INF/services/com.sun.tools.attach.spi.AttachProvider" >> $@ |
|
556 |
$(ECHO) "com/sun/tools/attach/" >> $@ |
|
557 |
$(ECHO) "org/relaxng/datatype/" >> $@ |
|
558 |
$(ECHO) "com/sun/codemodel/" >> $@ |
|
559 |
$(ECHO) "com/sun/xml/internal/dtdparser/" >> $@ |
|
560 |
$(ECHO) "com/sun/xml/internal/rngom/" >> $@ |
|
561 |
$(ECHO) "com/sun/xml/internal/xsom/" >> $@ |
|
562 |
$(ECHO) "com/sun/tools/script/shell/" >> $@ |
|
563 |
$(ECHO) "sun/tools/attach/" >> $@ |
|
564 |
$(ECHO) "sun/tools/jstack/" >> $@ |
|
565 |
$(ECHO) "sun/tools/jinfo/" >> $@ |
|
566 |
$(ECHO) "sun/tools/jmap/" >> $@ |
|
567 |
||
568 |
||
569 |
# File order list for rt.jar |
|
570 |
# - sun.applet is included, till hotjava stops relying on it. |
|
571 |
# - sun.tools.jar is included, needs cleanup. |
|
572 |
# |
|
573 |
REORDER_TEMPDIR=$(ABS_TEMPDIR)/reorder |
|
574 |
TOTAL_JAR_FILELIST=$(REORDER_TEMPDIR)/file_list |
|
575 |
||
576 |
JARFILELISTS_TEMPDIR=$(ABS_TEMPDIR)/jarfilelists |
|
577 |
RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/rt_jar_list |
|
578 |
RES_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/resources_jar_list |
|
579 |
||
580 |
JARREORDER_JARFILE = $(ABS_BUILDTOOLJARDIR)/jarreorder.jar |
|
581 |
||
582 |
$(TOTAL_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_RT_JAR_LIST) |
|
583 |
$(prep-target) |
|
584 |
$(RM) $@.temp |
|
585 |
($(CD) $(CLASSBINDIR) && \ |
|
586 |
$(BOOT_JAVA_CMD) -jar $(JARREORDER_JARFILE) \ |
|
587 |
-o $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . ) |
|
588 |
$(MV) $@.temp $@ |
|
589 |
@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup)) |
|
590 |
||
591 |
# Create the rt.jar file list & non-class files list |
|
592 |
||
593 |
JARSPLIT_JARFILE = $(BUILDTOOLJARDIR)/jarsplit.jar |
|
594 |
||
595 |
$(RT_JAR_FILELIST) + $(RES_JAR_FILELIST): \ |
|
596 |
$(TOTAL_JAR_FILELIST) $(JARSPLIT_JARFILE) |
|
597 |
@$(RM) $(RT_JAR_FILELIST) $(RES_JAR_FILELIST) |
|
598 |
$(MKDIR) -p $(JARFILELISTS_TEMPDIR) |
|
599 |
$(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) \ |
|
600 |
$(TOTAL_JAR_FILELIST) \ |
|
601 |
-o $(RT_JAR_FILELIST) $(RES_JAR_FILELIST) |
|
602 |
@$(java-vm-cleanup) |
|
603 |
||
604 |
# Create the manifest file. |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
605 |
JAR_MANIFEST_FILE=$(ABS_TEMPDIR)/manifest.tmp |
| 2 | 606 |
$(JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) |
607 |
$(prep-target) |
|
| 5552 | 608 |
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ |
609 |
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ |
|
610 |
$(MAINMANIFEST) >> $@ |
|
| 2 | 611 |
$(ECHO) >> $@ |
612 |
$(CAT) $(BEANMANIFEST) >> $@ |
|
613 |
||
614 |
# Create resources.jar containing non-class files |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
615 |
RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
616 |
$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) |
| 2 | 617 |
$(prep-target) |
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
618 |
$(CD) $(CLASSBINDIR) && \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
619 |
$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
620 |
@$(RES_JAR_FILELIST) $(BOOT_JAR_JFLAGS) |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
621 |
@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) |
| 2 | 622 |
|
623 |
# Create jsse.jar containing SunJSSE implementation classes |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
624 |
JSSE_JAR=$(ABS_TEMPDIR)/jsse-orig.jar |
| 2 | 625 |
$(JSSE_JAR): $(JAR_MANIFEST_FILE) |
626 |
$(prep-target) |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
627 |
$(CD) $(CLASSBINDIR) && \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
628 |
$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
629 |
$(JSSE_CLASSES_DIRS) $(BOOT_JAR_JFLAGS) |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
630 |
@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) |
| 2 | 631 |
|
632 |
# Create sec-bin.zip |
|
633 |
SEC_FILES_ZIP=$(ABS_TEMPDIR)/sec-bin.zip |
|
634 |
sec-files:: |
|
635 |
$(prep-target) |
|
636 |
$(RM) $(SEC_FILES_ZIP) |
|
637 |
$(CD) $(OUTPUTDIR) && \ |
|
638 |
$(ZIPEXE) -rq9 $(SEC_FILES_ZIP) $(SEC_FILES_DIRS) |
|
639 |
@$(java-vm-cleanup) |
|
640 |
||
641 |
# Create sec-windows-bin.zip |
|
642 |
SEC_FILES_WIN_ZIP=$(ABS_TEMPDIR)/sec-windows-bin.zip |
|
643 |
sec-files-win:: |
|
644 |
ifeq ($(PLATFORM), windows) |
|
645 |
$(prep-target) |
|
646 |
$(RM) $(SEC_FILES_WIN_ZIP) |
|
647 |
$(CD) $(OUTPUTDIR) && \ |
|
648 |
$(ZIPEXE) -rq9 $(SEC_FILES_WIN_ZIP) $(SEC_FILES_WIN_DIRS) |
|
649 |
@$(java-vm-cleanup) |
|
650 |
endif |
|
651 |
||
652 |
# Create JGSS files that contains the native Kerberos library |
|
653 |
JGSS_WIN32_FILES_ZIP=$(ABS_TEMPDIR)/jgss-windows-i586-bin.zip |
|
654 |
JGSS_WIN64_FILES_ZIP=$(ABS_TEMPDIR)/jgss-windows-x64-bin.zip |
|
655 |
jgss-files:: |
|
656 |
ifeq ($(PLATFORM), windows) |
|
657 |
$(prep-target) |
|
658 |
ifeq ($(ARCH_DATA_MODEL), 32) |
|
659 |
$(RM) $(JGSS_WIN32_FILES_ZIP) |
|
660 |
$(CD) $(OUTPUTDIR) && \ |
|
661 |
$(ZIPEXE) -rq9 $(JGSS_WIN32_FILES_ZIP) $(JGSS_FILES_DIRS) |
|
662 |
else |
|
663 |
$(RM) $(JGSS_WIN64_FILES_ZIP) |
|
664 |
$(CD) $(OUTPUTDIR) && \ |
|
665 |
$(ZIPEXE) -rq9 $(JGSS_WIN64_FILES_ZIP) $(JGSS_FILES_DIRS) |
|
666 |
endif |
|
667 |
@$(java-vm-cleanup) |
|
668 |
endif |
|
669 |
||
670 |
# Create rt.jar |
|
671 |
RT_JAR=$(ABS_TEMPDIR)/rt-orig.jar |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
672 |
$(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE) |
| 2 | 673 |
$(prep-target) |
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
674 |
$(CD) $(CLASSBINDIR) && \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
675 |
$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
676 |
@$(RT_JAR_FILELIST) $(BOOT_JAR_JFLAGS) |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
677 |
@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) |
| 2 | 678 |
|
679 |
# Meta-index construction to make core class loaders lazier |
|
680 |
||
681 |
BUILDMETAINDEX_JARFILE = $(ABS_BUILDTOOLJARDIR)/buildmetaindex.jar |
|
682 |
||
683 |
###################################################### |
|
684 |
# JRE Image |
|
685 |
###################################################### |
|
686 |
||
687 |
initial-image-jre-setup: |
|
688 |
$(RM) -r $(JRE_IMAGE_DIR) |
|
689 |
$(MKDIR) -p $(JRE_IMAGE_DIR) |
|
690 |
||
691 |
# 64-bit solaris jre image contains only the 64-bit add-on files. |
|
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
692 |
initial-image-jre-sol64:: initial-image-jre-setup |
| 2 | 693 |
@# Use tar instead of cp to preserve the symbolic links |
694 |
for dir in bin lib ; do \ |
|
695 |
( $(CD) $(OUTPUTDIR) && \ |
|
696 |
$(TAR) cf - `$(FIND) $$dir -name '$(ARCH)' -print` | \ |
|
697 |
($(CD) $(JRE_IMAGE_DIR) && $(TAR) xf -) ) ; \ |
|
698 |
done |
|
699 |
@# Remove some files from the jre area |
|
700 |
for t in $(NOTJRETOOLS) ; do \ |
|
701 |
$(RM) $(JRE_IMAGE_DIR)/bin$(ISA_DIR)/$$t ; \ |
|
702 |
done |
|
703 |
for l in $(NOTJRELIBS) ; do \ |
|
704 |
$(RM) $(JRE_IMAGE_DIR)/lib/$$l ; \ |
|
705 |
done |
|
706 |
$(RM) `$(FIND) $(JRE_IMAGE_DIR)/lib -name 'orb.idl'` |
|
707 |
$(RM) `$(FIND) $(JRE_IMAGE_DIR)/lib -name 'ir.idl'` |
|
708 |
||
709 |
# Construct an initial jre image (initial jdk jre) no trimming or stripping |
|
|
5381
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
710 |
# See "initial-image-jdk-setup" for an explanation of the rm of |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
711 |
# drive names like C: |
| 2 | 712 |
initial-image-jre:: initial-image-jre-setup \ |
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
713 |
$(JRE_DOCFILES) \ |
| 2 | 714 |
$(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) \ |
715 |
$(BUILDMETAINDEX_JARFILE) |
|
716 |
@# Copy in bin directory |
|
717 |
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR) |
|
718 |
@# CTE plugin security change require new empty directory lib/applet |
|
719 |
$(MKDIR) -p $(JRE_IMAGE_DIR)/lib/applet |
|
720 |
@# Copy in lib directory |
|
721 |
$(CD) $(OUTPUTDIR) && $(FIND) lib -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR) |
|
|
5381
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
722 |
ifeq ($(USING_CYGWIN),true) |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
723 |
$(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]: |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
724 |
$(RM) -rf $(OUTPUTDIR)/[A-Za-z]: |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
725 |
endif |
| 2 | 726 |
@# Make sure all directories are read/execute for everyone |
727 |
$(CHMOD) a+rx `$(FIND) $(JRE_IMAGE_DIR) -type d` |
|
728 |
@# Remove some files from the jre area |
|
729 |
for t in $(NOTJRETOOLS) ; do \ |
|
730 |
$(RM) $(JRE_IMAGE_DIR)/bin$(ISA_DIR)/$$t ; \ |
|
731 |
done |
|
732 |
for l in $(NOTJRELIBS) ; do \ |
|
733 |
$(RM) $(JRE_IMAGE_DIR)/lib/$$l ; \ |
|
734 |
done |
|
735 |
@# Remove orb.idl and ir.idl from jre |
|
736 |
$(FIND) $(JRE_IMAGE_DIR)/lib -name 'orb.idl' -exec $(RM) \{} \;
|
|
737 |
$(FIND) $(JRE_IMAGE_DIR)/lib -name 'ir.idl' -exec $(RM) \{} \;
|
|
738 |
@# Copy in rt.jar & resources.jar file |
|
739 |
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar |
|
740 |
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar |
|
741 |
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar |
|
742 |
@# Generate meta-index to make boot and extension class loaders lazier |
|
743 |
$(CD) $(JRE_IMAGE_DIR)/lib && \ |
|
744 |
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \ |
|
745 |
-o meta-index *.jar |
|
746 |
@$(CD) $(JRE_IMAGE_DIR)/lib && $(java-vm-cleanup) |
|
747 |
$(CD) $(JRE_IMAGE_DIR)/lib/ext && \ |
|
748 |
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \ |
|
749 |
-o meta-index *.jar |
|
750 |
@$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup) |
|
751 |
ifeq ($(PLATFORM), windows) |
|
752 |
@# Remove certain *.lib files |
|
753 |
$(CD) $(JRE_IMAGE_DIR)/lib && \ |
|
754 |
$(RM) java.$(LIB_SUFFIX) jvm.$(LIB_SUFFIX) \ |
|
| 7967 | 755 |
awt.$(LIB_SUFFIX) jawt.$(LIB_SUFFIX) |
|
3111
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2763
diff
changeset
|
756 |
ifeq ($(ARCH_DATA_MODEL), 32) |
|
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2763
diff
changeset
|
757 |
@# The Java Kernel JRE image ships with a special VM. It is not included |
|
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2763
diff
changeset
|
758 |
@# in the full JRE image, so remove it. Also, is it only for 32-bit windows. |
|
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2763
diff
changeset
|
759 |
$(CD) $(JRE_IMAGE_DIR)/bin && $(RM) -r kernel |
|
fefdeafb7ab9
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
herrick
parents:
2763
diff
changeset
|
760 |
endif |
| 2 | 761 |
endif # Windows |
762 |
ifneq ($(PLATFORM), windows) |
|
763 |
$(call copy-man-pages,$(JRE_IMAGE_DIR),$(JRE_MAN_PAGES)) |
|
764 |
endif # !windows |
|
765 |
||
766 |
# Trim out any extra files not for the jre shipment but wanted in the jdk jre. |
|
767 |
# (Note the jdk WILL want the jre image before this trimming) |
|
768 |
# Removes server VM on Windows 32bit. |
|
769 |
# Remove certain shared libraries that should not be in the jre image |
|
770 |
# but should be in the jdk jre image. |
|
771 |
trim-image-jre:: |
|
772 |
ifeq ($(PLATFORM), windows) |
|
773 |
ifeq ($(ARCH_DATA_MODEL), 32) |
|
774 |
$(RM) -r $(JRE_IMAGE_DIR)/bin/server |
|
775 |
endif |
|
776 |
ifdef NOTJRE_SHARED_LIBS |
|
777 |
for l in $(NOTJRE_SHARED_LIBS) ; do \ |
|
778 |
$(RM) $(JRE_IMAGE_DIR)/bin/$$l ; \ |
|
779 |
done ; |
|
780 |
endif |
|
781 |
else # PLATFORM |
|
782 |
ifdef NOTJRE_SHARED_LIBS |
|
783 |
for l in $(NOTJRE_SHARED_LIBS) ; do \ |
|
784 |
$(RM) $(JRE_IMAGE_DIR)/lib/$(LIBARCH)/$$l ; \ |
|
785 |
done ; |
|
786 |
endif |
|
787 |
endif # PLATFORM |
|
788 |
||
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
789 |
# Get list of all binary (COFF or Elf) files in the jre |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
790 |
JRE_BIN_LIST=$(TEMPDIR)/jre-bin-files.list |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
791 |
$(JRE_BIN_LIST): |
| 2 | 792 |
$(RM) $@ |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
793 |
ifeq ($(PLATFORM), windows) |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
794 |
$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*.exe \ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
795 |
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
796 |
else |
| 2 | 797 |
$(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@ |
798 |
$(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \ |
|
799 |
| $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@ |
|
800 |
endif |
|
801 |
||
802 |
# Post process the image (strips and mcs on Elf files we are shipping) |
|
803 |
# (Note the jdk WILL want the jre image before this processing) |
|
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
804 |
process-image-jre:: $(JRE_BIN_LIST) |
| 2 | 805 |
ifneq ($(POST_STRIP_PROCESS), ) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
806 |
@for f in `$(CAT) $(JRE_BIN_LIST)`; do \ |
| 2 | 807 |
$(CHMOD) u+w $${f}; \
|
808 |
$(ECHO) $(POST_STRIP_PROCESS) $${f}; \
|
|
809 |
$(POST_STRIP_PROCESS) $${f}; \
|
|
810 |
$(CHMOD) go-w $${f}; \
|
|
811 |
done |
|
812 |
endif |
|
813 |
ifneq ($(POST_MCS_PROCESS), ) |
|
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
814 |
@for f in `$(CAT) $(JRE_BIN_LIST)`; do \ |
| 2 | 815 |
$(CHMOD) u+w $${f}; \
|
816 |
$(ECHO) $(POST_MCS_PROCESS) $${f}; \
|
|
817 |
$(POST_MCS_PROCESS) $${f}; \
|
|
818 |
$(CHMOD) go-w $${f}; \
|
|
819 |
done |
|
820 |
endif |
|
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
821 |
@for f in `$(CAT) $(JRE_BIN_LIST)`; do \ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
822 |
$(call binary_file_verification,$${f}); \
|
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
823 |
done |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
824 |
$(RM) $(JRE_BIN_LIST) |
| 2 | 825 |
|
826 |
###################################################### |
|
827 |
# JDK Image |
|
828 |
###################################################### |
|
829 |
# Note: cpio ($(CPIO)) sometimes leaves directories without rx access. |
|
830 |
||
|
5381
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
831 |
# REMIND: the $(RM) calls for patterns like c:, d: following $(CPIO) |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
832 |
# are because the 1.7.x versions of cygwin's cpio command drops these |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
833 |
# in the working directory if the output path begins with that pattern |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
834 |
# The one for the output jre subdirectory gets there because cpio sees its |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
835 |
# own dropping in the input jre subdirectory. Need to remove both of these. |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
836 |
# We can remove these RM's if someone figures out how to stop cpio from |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
837 |
# leaving these there. |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
838 |
# Note that its a real problem not because this directory can end up in the |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
839 |
# bundle (I think it won't since it not in bin or lib and those are the |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
840 |
# only places from which we copy everything), but because the presence |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
841 |
# of this file causes cygwin's find to bomb out, thus breaking the build |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
842 |
# in "install". |
| 2 | 843 |
initial-image-jdk-setup: |
844 |
$(RM) -r $(JDK_IMAGE_DIR) |
|
845 |
$(MKDIR) -p $(JDK_IMAGE_DIR)/jre |
|
846 |
($(CD) $(JRE_IMAGE_DIR) && $(FIND) . -depth -print \ |
|
847 |
| $(CPIO) -pdum $(JDK_IMAGE_DIR)/jre ) |
|
|
5381
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
848 |
ifeq ($(USING_CYGWIN),true) |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
849 |
$(RM) -rf $(JRE_IMAGE_DIR)/[A-Za-z]: |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
850 |
$(RM) -rf $(JDK_IMAGE_DIR)/jre/[A-Za-z]: |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
851 |
endif |
| 2 | 852 |
$(RM) -rf $(JDK_IMAGE_DIR)/jre/man |
853 |
$(CHMOD) a+rx `$(FIND) $(JDK_IMAGE_DIR) -type d` |
|
854 |
||
855 |
initial-image-jdk64-bindemos: |
|
856 |
for dir in bin demo ; do \ |
|
857 |
( $(CD) $(OUTPUTDIR) && \ |
|
858 |
$(TAR) cf - `$(FIND) $$dir -name '$(LIBARCH)' -print` | \ |
|
859 |
($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -) ) ; \ |
|
860 |
done |
|
861 |
||
862 |
# Solaris 64 bit image is special |
|
863 |
initial-image-jdk-sol64:: initial-image-jdk-setup \ |
|
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
864 |
initial-image-jdk64-bindemos |
| 2 | 865 |
|
866 |
# DB files to add |
|
867 |
ifdef OPENJDK |
|
868 |
||
869 |
initial-image-jdk-db: |
|
870 |
||
871 |
else |
|
872 |
||
873 |
# Create the list of db *.zip files to bundle with jdk |
|
874 |
ABS_DB_PATH :=$(call FullPath,$(CLOSED_SHARE_SRC)/db) |
|
875 |
DB_ZIP_LIST = $(shell $(LS) $(ABS_DB_PATH)/*.zip 2>/dev/null) |
|
876 |
||
877 |
initial-image-jdk-db: $(DB_ZIP_LIST) |
|
878 |
$(MKDIR) -p $(JDK_IMAGE_DIR)/db |
|
879 |
for d in $(DB_ZIP_LIST); do \ |
|
880 |
($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \ |
|
881 |
done |
|
882 |
||
883 |
endif |
|
884 |
||
885 |
# Standard jdk image |
|
886 |
initial-image-jdk:: initial-image-jdk-setup \ |
|
887 |
initial-image-jdk-db \ |
|
|
8009
faa3179b2b38
6980024: Rebranding jre7/jdk7 License, Copyright, Readme
ohair
parents:
8008
diff
changeset
|
888 |
$(JDK_DOCFILES) |
| 2 | 889 |
$(MKDIR) $(JDK_IMAGE_DIR)/lib |
890 |
@# |
|
891 |
@# Copy in the jars in lib that only belong in the JDK |
|
892 |
@# |
|
893 |
for l in $(NOTJRELIBS); do \ |
|
894 |
if [ -r $(LIBDIR)/$$l ]; then \ |
|
895 |
$(CP) $(LIBDIR)/$$l $(JDK_IMAGE_DIR)/lib; \ |
|
896 |
fi; \ |
|
897 |
done |
|
898 |
ifeq ($(PLATFORM), windows) |
|
899 |
@# |
|
900 |
@# lib/ |
|
901 |
@# |
|
902 |
$(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib |
|
903 |
$(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib |
|
904 |
@# |
|
905 |
@# bin/ |
|
906 |
@# |
|
907 |
@# copy all EXE files and only certain DLL files from BINDIR |
|
908 |
$(MKDIR) -p $(JDK_IMAGE_DIR)/bin |
|
909 |
$(CP) $(BINDIR)/*$(EXE_SUFFIX) $(JDK_IMAGE_DIR)/bin |
|
910 |
$(CP) $(BINDIR)/jli.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin |
|
|
5381
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
911 |
ifeq ($(COMPILER_VERSION), VS2010) |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
912 |
$(CP) $(BINDIR)/msvc*100.$(LIBRARY_SUFFIX) $(JDK_IMAGE_DIR)/bin |
|
d6d64a42ff51
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
4115
diff
changeset
|
913 |
endif |
| 2 | 914 |
else # PLATFORM |
915 |
@# |
|
916 |
@# bin/ |
|
917 |
@# |
|
918 |
($(CD) $(BINDIR)/.. && $(TAR) cf - \ |
|
919 |
`$(FIND) bin \( -type f -o -type l \) -print `) | \ |
|
920 |
($(CD) $(JDK_IMAGE_DIR) && $(TAR) xf -) |
|
921 |
endif # PLATFORM |
|
922 |
@# |
|
923 |
@# files that might not exist need to be touched. |
|
924 |
@# |
|
925 |
$(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.xjc.Plugin |
|
926 |
@# |
|
927 |
@# lib/tools.jar |
|
928 |
@# |
|
|
3057
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
929 |
$(CD) $(CLASSBINDIR) && \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
930 |
$(BOOT_JAR_CMD) c0f $(ABS_LIBDIR)/tools.jar \ |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
931 |
$(TOOLS) $(BOOT_JAR_JFLAGS) |
|
c5b370763c63
6853806: Prefer (cd $dir && jar) to jar -C for performance reasons
martin
parents:
2939
diff
changeset
|
932 |
@$(CD) $(CLASSBINDIR) && $(java-vm-cleanup) |
| 2 | 933 |
$(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar |
934 |
@# |
|
935 |
@# lib/ct.sym |
|
936 |
@# |
|
937 |
$(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym |
|
938 |
$(JAVAC_CMD) -XDprocess.packages -proc:only \ |
|
939 |
-processor com.sun.tools.javac.sym.CreateSymbols \ |
|
940 |
-Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ |
|
941 |
-Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ |
|
|
5789
246b84dc50d9
6960789: com.sun.servicetag API needs to be added in ct.sym
mchung
parents:
5506
diff
changeset
|
942 |
$(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) |
| 2 | 943 |
$(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ |
|
916
867515b155b5
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
ohair
parents:
715
diff
changeset
|
944 |
-C $(OUTPUTDIR)/symbols META-INF $(BOOT_JAR_JFLAGS) |
| 2 | 945 |
@$(java-vm-cleanup) |
946 |
$(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym |
|
947 |
@# |
|
948 |
@# CORBA supported orb.idl and ir.idl should be copied to lib |
|
949 |
@# |
|
950 |
$(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl |
|
951 |
$(CP) $(LIBDIR)/ir.idl $(JDK_IMAGE_DIR)/lib/ir.idl |
|
952 |
ifeq ($(PLATFORM), linux) |
|
953 |
@# |
|
954 |
@# on Linux copy jexec from jre/lib to /lib |
|
955 |
@# |
|
956 |
$(CP) $(LIBDIR)/jexec $(JDK_IMAGE_DIR)/lib/jexec |
|
957 |
endif # PLATFORM |
|
958 |
@# |
|
959 |
@# src.zip |
|
960 |
@# |
|
961 |
$(MKDIR) -p $(JDK_IMAGE_DIR)/src |
|
962 |
@# |
|
963 |
@# The '*-*' pattern in the find command excludes files named with dashes, |
|
964 |
@# such as the java.nio templates for generated classes |
|
965 |
@# |
|
966 |
@# The Linux 'tar' command cannot handle the huge command line argument |
|
967 |
@# generated by the more efficient solaris/windows method of copying files. |
|
968 |
@# So for Linux, make use of the -T option (like Solaris' -I option) of |
|
969 |
@# obtaining the list of files from a file. MKS tar has no such option. |
|
970 |
ifeq ($(PLATFORM), linux) |
|
971 |
for d in $(SOURCE_DIRS); do \ |
|
972 |
$(RM) $(ABS_TEMPDIR)/src-files.list; \ |
|
973 |
($(CD) $$d && \ |
|
974 |
for sd in $(SOURCES) ; do \ |
|
975 |
if [ -d $$sd ] ; then \ |
|
976 |
$(FIND) $$sd $(SOURCE_FILES_filter) \ |
|
977 |
-name '*.java' -print \ |
|
978 |
>> $(ABS_TEMPDIR)/src-files.list ; \ |
|
979 |
fi; \ |
|
980 |
done ; \ |
|
981 |
) ; \ |
|
982 |
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ |
|
983 |
($(CD) $$d && $(TAR) cf - -T $(ABS_TEMPDIR)/src-files.list ) \ |
|
984 |
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \ |
|
985 |
fi; \ |
|
986 |
done |
|
987 |
else |
|
988 |
for d in $(SOURCE_DIRS); do \ |
|
989 |
$(RM) $(ABS_TEMPDIR)/src-files.list; \ |
|
990 |
($(CD) $$d && \ |
|
991 |
for sd in $(SOURCES) ; do \ |
|
992 |
if [ -d $$sd ] ; then \ |
|
993 |
$(FIND) $$sd $(SOURCE_FILES_filter) \ |
|
994 |
-name '*.java' -print \ |
|
995 |
>> $(ABS_TEMPDIR)/src-files.list ; \ |
|
996 |
fi; \ |
|
997 |
done ; \ |
|
998 |
) ; \ |
|
999 |
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ |
|
1000 |
($(CD) $$d && $(TAR) cf - `$(CAT) $(ABS_TEMPDIR)/src-files.list`) \ |
|
1001 |
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \ |
|
1002 |
fi; \ |
|
1003 |
done |
|
1004 |
endif |
|
1005 |
$(RM) $(ABS_TEMPDIR)/src-files.list |
|
1006 |
$(CHMOD) -R +w $(JDK_IMAGE_DIR)/src |
|
1007 |
$(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher |
|
1008 |
$(CP) $(SHARE_SRC)/bin/java.c $(JDK_IMAGE_DIR)/src/launcher |
|
1009 |
$(CP) $(SHARE_SRC)/bin/java.h $(JDK_IMAGE_DIR)/src/launcher |
|
1010 |
$(CP) $(SHARE_SRC)/bin/manifest_info.h $(JDK_IMAGE_DIR)/src/launcher |
|
1011 |
$(CP) $(SHARE_SRC)/bin/parse_manifest.c $(JDK_IMAGE_DIR)/src/launcher |
|
1012 |
$(CP) $(SHARE_SRC)/bin/version_comp.c $(JDK_IMAGE_DIR)/src/launcher |
|
1013 |
$(CP) $(SHARE_SRC)/bin/version_comp.h $(JDK_IMAGE_DIR)/src/launcher |
|
1014 |
$(CP) $(SHARE_SRC)/bin/wildcard.h $(JDK_IMAGE_DIR)/src/launcher |
|
1015 |
$(CP) $(SHARE_SRC)/bin/wildcard.c $(JDK_IMAGE_DIR)/src/launcher |
|
1016 |
$(CP) $(SHARE_SRC)/bin/jli_util.h $(JDK_IMAGE_DIR)/src/launcher |
|
1017 |
$(CP) $(SHARE_SRC)/bin/jli_util.c $(JDK_IMAGE_DIR)/src/launcher |
|
1018 |
$(CP) $(SHARE_SRC)/bin/splashscreen_stubs.c $(JDK_IMAGE_DIR)/src/launcher |
|
1019 |
$(CP) $(SHARE_SRC)/bin/splashscreen.h $(JDK_IMAGE_DIR)/src/launcher |
|
1020 |
$(CP) $(PLATFORM_SRC)/bin/java_md.c $(JDK_IMAGE_DIR)/src/launcher |
|
1021 |
$(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher |
|
1022 |
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip * |
|
1023 |
$(RM) -r $(JDK_IMAGE_DIR)/src |
|
1024 |
@# |
|
1025 |
@# demo, include |
|
1026 |
@# |
|
1027 |
$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR) |
|
1028 |
$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR) |
|
1029 |
$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR) |
|
1030 |
@# |
|
1031 |
@# Swing BeanInfo generation |
|
1032 |
@# |
|
1033 |
$(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans |
|
1034 |
ifneq ($(PLATFORM), windows) |
|
1035 |
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) |
|
1036 |
endif # !windows |
|
1037 |
||
1038 |
# Trim out files we don't want to ship |
|
1039 |
trim-image-jdk:: |
|
1040 |
@# Remove tools that should not be part of SDK. |
|
1041 |
for t in $(NOTJDKTOOLS); do \ |
|
| 7967 | 1042 |
$(RM) $(JDK_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX); \
|
| 2 | 1043 |
done |
1044 |
||
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1045 |
# Get list of binary (COFF or Elf) files in the jdk |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1046 |
JDK_BIN_LIST=$(TEMPDIR)/jdk-bin-files.list |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1047 |
$(JDK_BIN_LIST): |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1048 |
ifeq ($(PLATFORM), windows) |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1049 |
$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*.exe \ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1050 |
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1051 |
$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*.exe \ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1052 |
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" >> $@ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1053 |
else |
| 2 | 1054 |
$(RM) $@ |
1055 |
$(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@ |
|
1056 |
$(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_SUFFIX)` \ |
|
1057 |
| $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@ |
|
1058 |
file `$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \ |
|
1059 |
| $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@ |
|
1060 |
endif |
|
1061 |
||
1062 |
# Post process the image (strips and mcs on files we are shipping) |
|
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1063 |
process-image-jdk:: $(JDK_BIN_LIST) |
| 2 | 1064 |
ifneq ($(POST_STRIP_PROCESS), ) |
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1065 |
@for f in `$(CAT) $(JDK_BIN_LIST)`; do \ |
| 2 | 1066 |
$(CHMOD) u+w $${f}; \
|
1067 |
$(ECHO) $(POST_STRIP_PROCESS) $${f}; \
|
|
1068 |
$(POST_STRIP_PROCESS) $${f}; \
|
|
1069 |
$(CHMOD) go-w $${f}; \
|
|
1070 |
done |
|
1071 |
endif |
|
1072 |
ifneq ($(POST_MCS_PROCESS), ) |
|
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1073 |
@for f in `$(CAT) $(JDK_BIN_LIST)`; do \ |
| 2 | 1074 |
$(CHMOD) u+w $${f}; \
|
1075 |
$(ECHO) $(POST_MCS_PROCESS) $${f}; \
|
|
1076 |
$(POST_MCS_PROCESS) $${f}; \
|
|
1077 |
$(CHMOD) go-w $${f}; \
|
|
1078 |
done |
|
1079 |
endif |
|
|
8008
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1080 |
@for f in `$(CAT) $(JDK_BIN_LIST)`; do \ |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1081 |
$(call binary_file_verification,$${f}); \
|
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1082 |
done |
|
753c38f4af83
6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
ohair
parents:
7668
diff
changeset
|
1083 |
$(RM) $(JDK_BIN_LIST) |
| 2 | 1084 |
|
1085 |
################################################################### |
|
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1086 |
# What did we build |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1087 |
################################################################### |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1088 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1089 |
# The jdk text info file that lives at the root of the install image. |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1090 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1091 |
JDK_INFO_FILE = $(JDK_IMAGE_DIR)/release |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1092 |
JRE_INFO_FILE = $(JRE_IMAGE_DIR)/release |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1093 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1094 |
# Common way to emit a line into the release or info file |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1095 |
define info-file-item # name value |
|
8454
527d9c4e670e
7022237: Fix use of \" in the new "release" file at the top of the install, windows issues
ohair
parents:
8270
diff
changeset
|
1096 |
$(PRINTF) '%s="%s"\n' $1 $2 >> $@ |
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1097 |
endef |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1098 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1099 |
# Values to emit |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1100 |
MINIMUM_OS_NAME := $(REQUIRED_OS_NAME) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1101 |
MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1102 |
MINIMUM_OS_ARCH := $(ARCH) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1103 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1104 |
$(JDK_INFO_FILE): FRC |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1105 |
$(prep-target) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1106 |
$(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1107 |
$(call info-file-item, "OS_NAME", "$(MINIMUM_OS_NAME)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1108 |
$(call info-file-item, "OS_VERSION", "$(MINIMUM_OS_VERSION)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1109 |
$(call info-file-item, "OS_ARCH", "$(MINIMUM_OS_ARCH)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1110 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1111 |
# Create release file to identify this image |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1112 |
identify-image-jdk:: $(JDK_INFO_FILE) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1113 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1114 |
$(JRE_INFO_FILE): FRC |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1115 |
$(prep-target) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1116 |
$(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1117 |
$(call info-file-item, "OS_NAME", "$(MINIMUM_OS_NAME)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1118 |
$(call info-file-item, "OS_VERSION", "$(MINIMUM_OS_VERSION)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1119 |
$(call info-file-item, "OS_ARCH", "$(MINIMUM_OS_ARCH)") |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1120 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1121 |
# Create release file to identify this image |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1122 |
identify-image-jre:: $(JRE_INFO_FILE) |
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1123 |
|
|
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1124 |
################################################################### |
| 2 | 1125 |
# What do we compare against |
1126 |
################################################################### |
|
1127 |
||
1128 |
# The temporary files and areas created |
|
1129 |
TEMP_PREV_JRE_BASE_DIR=$(TEMPDIR)/previous_jre |
|
1130 |
TEMP_PREV_JDK_BASE_DIR=$(TEMPDIR)/previous_jdk |
|
1131 |
TEMP_PREV_JRE_COMPARISON=$(TEMP_PREV_JRE_BASE_DIR)/previous_jre_comparison.txt |
|
1132 |
TEMP_PREV_JDK_COMPARISON=$(TEMP_PREV_JDK_BASE_DIR)/previous_jdk_comparison.txt |
|
1133 |
TEMP_PREV_JRE_IMAGE_DIR=$(TEMP_PREV_JRE_BASE_DIR)/jre$(PREVIOUS_JDK_VERSION) |
|
1134 |
TEMP_PREV_JDK_IMAGE_DIR=$(TEMP_PREV_JDK_BASE_DIR)/jdk$(PREVIOUS_JDK_VERSION) |
|
1135 |
||
1136 |
# unbundle(sourcedir,bundlename,destdir) |
|
1137 |
# logic is slightly different if a .tar.gz file (linux) |
|
1138 |
define unbundle |
|
1139 |
$(RM) -r $3 |
|
1140 |
$(MKDIR) -p $3 |
|
1141 |
$(CP) $1 $3 |
|
1142 |
if [ "`$(BASENAME) $2 .gz`" != "$2" ] ; then \ |
|
1143 |
( $(CD) $3 && ( $(GUNZIP) -dc $2 | $(TAR) xf - ) && $(RM) $2 ); \ |
|
1144 |
else \ |
|
1145 |
( $(CD) $3 && $(TAR) xf $2 && $(RM) $2 ); \ |
|
1146 |
fi |
|
1147 |
( $(CD) $3 && $(RM) $2 ) |
|
1148 |
endef |
|
1149 |
||
1150 |
# In general, ignore the fastdebug tree, and changes in the demo and sample area |
|
1151 |
COMPARE_FILTER = | $(EGREP) -v /fastdebug/ | $(EGREP) -v /demo/ | $(EGREP) -v /sample/ |
|
1152 |
||
1153 |
# If a previuous image is provided, no need to install it. |
|
|
916
867515b155b5
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
ohair
parents:
715
diff
changeset
|
1154 |
ifdef PREVIOUS_RELEASE_IMAGE |
| 2 | 1155 |
|
1156 |
# Just use the pre-installed images |
|
|
916
867515b155b5
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
ohair
parents:
715
diff
changeset
|
1157 |
PREV_JRE_IMAGE_DIR=$(PREVIOUS_RELEASE_IMAGE)/jre |
|
867515b155b5
6728161: Add SKIP_BOOT_CYCLE feature to create boot jdk and use it during build
ohair
parents:
715
diff
changeset
|
1158 |
PREV_JDK_IMAGE_DIR=$(PREVIOUS_RELEASE_IMAGE) |
| 2 | 1159 |
|
1160 |
else |
|
1161 |
||
1162 |
# Use the temp images we will create |
|
1163 |
PREV_JRE_IMAGE_DIR=$(TEMP_PREV_JRE_IMAGE_DIR) |
|
1164 |
PREV_JDK_IMAGE_DIR=$(TEMP_PREV_JDK_IMAGE_DIR) |
|
1165 |
||
1166 |
# Force the installation in this case |
|
1167 |
compare-image:: install-previous-sanity install-previous-jre install-previous-jdk |
|
1168 |
||
1169 |
# Unbundle the jre |
|
1170 |
$(TEMP_PREV_JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX): $(PREVIOUS_JRE_BUNDLE) |
|
1171 |
$(call unbundle,$(PREVIOUS_JRE_BUNDLE),$(PREVIOUS_JRE_FILE),$(TEMP_PREV_JRE_BASE_DIR)) |
|
1172 |
$(TOUCH) $@ |
|
1173 |
||
1174 |
# Unbundle the jdk |
|
1175 |
$(TEMP_PREV_JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX): $(PREVIOUS_JDK_BUNDLE) |
|
1176 |
$(call unbundle,$(PREVIOUS_JDK_BUNDLE),$(PREVIOUS_JDK_FILE),$(TEMP_PREV_JDK_BASE_DIR)) |
|
1177 |
$(TOUCH) $@ |
|
1178 |
||
1179 |
endif |
|
1180 |
||
1181 |
# Make sure all images have a java in them (used as the touch file) |
|
1182 |
install-previous-sanity: |
|
1183 |
@if [ ! -f $(PREVIOUS_JRE_BUNDLE) ]; then \ |
|
1184 |
$(ECHO) "ERROR: You do not have access to the previous java release jre bundles. \n" \ |
|
1185 |
" Please check your access to \n" \ |
|
1186 |
" $(PREVIOUS_JRE_BUNDLE) \n" \ |
|
1187 |
" and/or check your value of ALT_PREVIOUS_RELEASE_PATH or ALT_PREVIOUS_JRE_FILE \n" \ |
|
1188 |
" This will affect you if you build the images target. \n" \ |
|
1189 |
"" >> $(ERROR_FILE) ; \ |
|
1190 |
fi |
|
1191 |
@if [ ! -f $(PREVIOUS_JDK_BUNDLE) ]; then \ |
|
1192 |
$(ECHO) "ERROR: You do not have access to the previous java release sdk bundles. \n" \ |
|
1193 |
" Please check your access to \n" \ |
|
1194 |
" $(PREVIOUS_sdk_BUNDLE) \n" \ |
|
1195 |
" and/or check your value of ALT_PREVIOUS_RELEASE_PATH or ALT_PREVIOUS_JDK_FILE. \n" \ |
|
1196 |
" This will affect you if you build the images target. \n" \ |
|
1197 |
"" >> $(ERROR_FILE) ; \ |
|
1198 |
fi |
|
1199 |
install-previous-jre: $(PREV_JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX) |
|
1200 |
install-previous-jdk: $(PREV_JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX) |
|
1201 |
||
1202 |
# Create the jre comparison report |
|
1203 |
$(TEMP_PREV_JRE_COMPARISON): install-previous-jre $(DIRDIFF_JARFILE) |
|
1204 |
$(prep-target) |
|
1205 |
$(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \ |
|
1206 |
$(PREV_JRE_IMAGE_DIR) $(JRE_IMAGE_DIR) | $(SORT) > $@ |
|
1207 |
@$(java-vm-cleanup) |
|
1208 |
||
1209 |
# Create the jdk comparison report |
|
1210 |
$(TEMP_PREV_JDK_COMPARISON): install-previous-jdk $(DIRDIFF_JARFILE) |
|
1211 |
$(prep-target) |
|
1212 |
$(BOOT_JAVA_CMD) -jar $(DIRDIFF_JARFILE) \ |
|
1213 |
$(PREV_JDK_IMAGE_DIR) $(JDK_IMAGE_DIR) | $(SORT) > $@ |
|
1214 |
@$(java-vm-cleanup) |
|
1215 |
||
1216 |
# Clean up names in the messages printed out |
|
1217 |
CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE@g" \ |
|
1218 |
-e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE@g" |
|
1219 |
||
1220 |
# Report on the jre image comparison |
|
1221 |
compare-image-jre: $(TEMP_PREV_JRE_COMPARISON) |
|
1222 |
@$(ECHO) "JRE Image Comparison to version $(PREVIOUS_JDK_VERSION)" |
|
1223 |
@$(ECHO) " Previous: $(PREV_JRE_IMAGE_DIR)" |
|
1224 |
@$(ECHO) " Current: $(JRE_IMAGE_DIR)" |
|
1225 |
@$(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER) |
|
1226 |
( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE) |
|
1227 |
||
1228 |
# Report on the jdk image comparison |
|
1229 |
compare-image-jdk: $(TEMP_PREV_JDK_COMPARISON) |
|
1230 |
@$(ECHO) "JDK Image Comparison to version $(PREVIOUS_JDK_VERSION)" |
|
1231 |
@$(ECHO) " Previous: $(PREV_JDK_IMAGE_DIR)" |
|
1232 |
@$(ECHO) " Current: $(JDK_IMAGE_DIR)" |
|
1233 |
$(CAT) $< $(COMPARE_FILTER) | $(CAT_FILTER) |
|
1234 |
( $(ECHO) " " ; $(CAT) $< | $(CAT_FILTER) ; $(ECHO) " " ) >> $(WARNING_FILE) |
|
1235 |
||
1236 |
# Do both image comparisons |
|
1237 |
compare-image:: compare-image-jre compare-image-jdk |
|
1238 |
||
1239 |
# Clean up any temp images and reports |
|
1240 |
compare-image-clobber: |
|
1241 |
$(RM) -r $(TEMP_PREV_JRE_BASE_DIR) |
|
1242 |
$(RM) -r $(TEMP_PREV_JDK_BASE_DIR) |
|
1243 |
||
1244 |
###################################################### |
|
1245 |
# clobber |
|
1246 |
###################################################### |
|
1247 |
images-clobber:: |
|
1248 |
$(RM) -r $(REORDER_TEMPDIR) |
|
1249 |
$(RM) -r $(JARFILELISTS_TEMPDIR) |
|
1250 |
ifeq ($(ARCH_DATA_MODEL), 32) |
|
1251 |
$(CD) javax/swing/beaninfo && $(MAKE) swingbeans.clobber |
|
1252 |
$(RM) -r $(CLASSBINDIR)/META-INF |
|
1253 |
$(RM) $(TEMPDIR)/tmp.jar |
|
1254 |
endif |
|
1255 |
ifeq ($(PLATFORM), linux) |
|
1256 |
$(RM) -r $(OUTPUTDIR)/$(ARCH) |
|
1257 |
endif |
|
1258 |
ifeq ($(PLATFORM), windows) |
|
1259 |
$(RM) $(TEMPDIR)/rebase.input |
|
1260 |
endif |
|
1261 |
$(RM) -r $(JDK_IMAGE_DIR) |
|
1262 |
$(RM) -r $(JRE_IMAGE_DIR) |
|
1263 |
||
1264 |
images images-clobber:: |
|
1265 |
@$(ECHO) ">>>Finished making "$@" @ `$(DATE)` ..." |
|
1266 |
@$(java-vm-cleanup) |
|
1267 |
||
1268 |
.PHONY: images image-jre image-jdk \ |
|
1269 |
initial-image-jre initial-image-jdk \ |
|
1270 |
initial-image-jre-sol64 initial-image-jdk-sol64 \ |
|
1271 |
initial-image-jdk-setup \ |
|
1272 |
initial-image-jdk-db \ |
|
1273 |
initial-image-jdk64-bindemos \ |
|
1274 |
initial-image-jre-setup \ |
|
1275 |
trim-image-jre trim-image-jdk \ |
|
1276 |
process-image-jre process-image-jdk \ |
|
|
8013
4efa283dbce2
6989472: Provide simple jdk identification information in the install image
ohair
parents:
8009
diff
changeset
|
1277 |
identify-image-jre identify-image-jdk \ |
| 2 | 1278 |
install-previous-jre install-previous-jdk \ |
1279 |
compare-image-jre compare-image-jdk \ |
|
1280 |
compare-image compare-image-clobber \ |
|
1281 |
images-clobber |
|
1282 |
||
1283 |
# Force rule |
|
1284 |
FRC: |
|
1285 |