author | coffeys |
Wed, 13 Nov 2019 11:27:50 +0000 | |
changeset 59055 | 57ad70bcf06c |
parent 58846 | f9ac726ab347 |
permissions | -rw-r--r-- |
37972 | 1 |
# |
54348 | 2 |
# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. |
37972 | 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 |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
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 |
# |
|
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. |
|
24 |
# |
|
25 |
||
26 |
default: all |
|
27 |
||
28 |
include $(SPEC) |
|
29 |
include MakeBase.gmk |
|
30 |
||
31 |
PRODUCT_TARGETS := |
|
54348 | 32 |
LEGACY_TARGETS := |
37972 | 33 |
TEST_TARGETS := |
34 |
DOCS_TARGETS := |
|
35 |
||
36 |
# On Windows tar frequently complains that "file changed as we read it" for |
|
37 |
# some random source files. This seems to be cause by anti virus scanners and |
|
38 |
# is most likely safe to ignore. When it happens, tar returns '1'. |
|
53683 | 39 |
ifeq ($(call isBuildOs, windows), true) |
37972 | 40 |
TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1" |
41 |
endif |
|
42 |
||
43 |
# Hook to include the corresponding custom file, if present. |
|
47314 | 44 |
$(eval $(call IncludeCustomExtension, Bundles-pre.gmk)) |
37972 | 45 |
################################################################################ |
46 |
# BUNDLE : Name of bundle to create |
|
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
47 |
# FILES : Files in BASE_DIRS to add to bundle |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
48 |
# SPECIAL_INCLUDES : List of directories inside BASE_DIRS to look for additional |
37972 | 49 |
# files in. These files will not get proper dependency handling. Use when |
50 |
# files or directories may contain spaces. |
|
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
51 |
# BASE_DIRS : Base directories for the root dir in the bundle. |
37972 | 52 |
# SUBDIR : Optional name of root dir in bundle. |
58720
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
53 |
# OUTPUTDIR : Optionally override output dir |
37972 | 54 |
SetupBundleFile = $(NamedParamsMacroTemplate) |
55 |
define SetupBundleFileBody |
|
56 |
||
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
57 |
$$(foreach d, $$($1_BASE_DIRS), \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
58 |
$$(eval $1_$$d_RELATIVE_FILES := $$$$(patsubst $$d/%, %, \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
59 |
$$$$(filter $$d/%, $$$$($1_FILES)))) \ |
42507
a3499e58c108
8171167: Build fails in Mach 5 with "File name too long."
erikj
parents:
42506
diff
changeset
|
60 |
$$(eval $1_$$d_LIST_FILE := \ |
47253
92fd0e04e0e1
8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents:
47217
diff
changeset
|
61 |
$(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(OUTPUTDIR)/%,%,$$d)_files)) \ |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
62 |
) |
37972 | 63 |
|
64 |
ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), ) |
|
65 |
$1_TYPE := tar.gz |
|
66 |
else ifneq ($$(filter %.zip, $$($1_BUNDLE_NAME)), ) |
|
67 |
$1_TYPE := zip |
|
68 |
else |
|
69 |
$$(error Unknown bundle type $$($1_BUNDLE_NAME)) |
|
70 |
endif |
|
71 |
||
72 |
$$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) |
|
73 |
||
58720
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
74 |
$$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR)) |
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
75 |
|
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
76 |
$$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) |
52065
dea8a62cdfc3
8211724: Change mkdir -p to MakeDir macro where possible
erikj
parents:
50490
diff
changeset
|
77 |
$$(call MakeTargetDir) |
58720
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
78 |
$$(call LogWarn, Creating $$($1_BUNDLE_NAME)) |
54380 | 79 |
# If any of the files contain a space in the file name, FindFiles |
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
80 |
# will have replaced it with ?. Tar does not accept that so need to |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
81 |
# switch it back. |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
82 |
$$(foreach d, $$($1_BASE_DIRS), \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
83 |
$$(eval $$(call ListPathsSafely, \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
84 |
$1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \ |
47334
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
85 |
$$(CAT) $$($1_$$d_LIST_FILE) | $$(TR) '?' ' ' > $$($1_$$d_LIST_FILE).tmp \ |
09d386ddaa42
8189095: Import JMC from artifactory using Jib and main makefiles
erikj
parents:
47314
diff
changeset
|
86 |
&& $(MV) $$($1_$$d_LIST_FILE).tmp $$($1_$$d_LIST_FILE) $$(NEWLINE) \ |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
87 |
) |
37972 | 88 |
ifneq ($$($1_SPECIAL_INCLUDES), ) |
89 |
$$(foreach i, $$($1_SPECIAL_INCLUDES), \ |
|
43051
6b8a8764b1fe
8172577: Builds for OS X after build 149 does not include Java Mission Control.app
erikj
parents:
43043
diff
changeset
|
90 |
$$(foreach d, $$($1_BASE_DIRS), \ |
6b8a8764b1fe
8172577: Builds for OS X after build 149 does not include Java Mission Control.app
erikj
parents:
43043
diff
changeset
|
91 |
($(CD) $$d && $(FIND) $$i >> $$($1_$$d_LIST_FILE)) ; )) |
37972 | 92 |
endif |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
93 |
ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO), .-zip-false) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
94 |
# If no subdir is specified, zip can be done directly from BASE_DIRS. |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
95 |
$$(foreach d, $$($1_BASE_DIRS), \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
96 |
( $(CD) $$d \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
97 |
&& $(ZIPEXE) -qru $$@ . -i@$$($1_$$d_LIST_FILE) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
98 |
|| test "$$$$?" = "12" )$$(NEWLINE)) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
99 |
else ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
100 |
.-tar.gz-false-1) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
101 |
# If no subdir is specified and only one BASE_DIR, tar.gz can be done |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
102 |
# directly from BASE_DIR. |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
103 |
$(CD) $$($1_BASE_DIRS) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
104 |
&& ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
105 |
-$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
106 |
$(TAR_IGNORE_EXIT_VALUE) ) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
107 |
| $(GZIP) > $$@ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
108 |
else ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
109 |
tar.gz-true-false-1) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
110 |
# If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
111 |
# transform option to create bundle directly from the BASE_DIR. |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
112 |
$(CD) $$($1_BASE_DIRS) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
113 |
&& ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
114 |
-$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \ |
42849
fa0a0a987432
8171548: JDK bundles changes sym links incorrectly in the legal directory
erikj
parents:
42507
diff
changeset
|
115 |
$$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|S') \ |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
116 |
$(TAR_IGNORE_EXIT_VALUE) ) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
117 |
| $(GZIP) > $$@ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
118 |
else |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
119 |
# In all other cases, need to copy all files into a temporary location |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
120 |
# before creation bundle. |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
121 |
$(RM) -r $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
122 |
$(MKDIR) -p $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
123 |
$$(foreach d, $$($1_BASE_DIRS), \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
124 |
( $(CD) $$d \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
125 |
&& $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
126 |
$(TAR_IGNORE_EXIT_VALUE) ) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
127 |
| ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) ) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
128 |
# Unzip any zipped debuginfo files |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
129 |
ifeq ($$($1_UNZIP_DEBUGINFO), true) |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
130 |
for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
131 |
$(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
132 |
done |
37972 | 133 |
endif |
134 |
ifeq ($$($1_TYPE), tar.gz) |
|
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
135 |
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
136 |
( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
137 |
$$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \ |
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
138 |
| $(GZIP) > $$@ |
37972 | 139 |
else ifeq ($$($1_TYPE), zip) |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
140 |
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ . |
37972 | 141 |
endif |
142 |
endif |
|
143 |
||
58720
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
144 |
$1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME) |
37972 | 145 |
|
146 |
endef |
|
147 |
||
148 |
################################################################################ |
|
149 |
||
150 |
# On Macosx, we bundle up the macosx specific images which already have the |
|
151 |
# correct base directories. |
|
53683 | 152 |
ifeq ($(call isTargetOs, macosx)+$(DEBUG_LEVEL), true+release) |
37972 | 153 |
JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR) |
54348 | 154 |
JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR) |
37972 | 155 |
JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home |
54348 | 156 |
JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home |
37972 | 157 |
JDK_BUNDLE_SUBDIR := |
54348 | 158 |
JRE_BUNDLE_SUBDIR := |
37972 | 159 |
else |
160 |
JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR) |
|
54348 | 161 |
JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR) |
37972 | 162 |
JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER) |
54348 | 163 |
JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER) |
37972 | 164 |
ifneq ($(DEBUG_LEVEL), release) |
165 |
JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
|
54348 | 166 |
JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL) |
37972 | 167 |
endif |
168 |
endif |
|
169 |
||
170 |
################################################################################ |
|
171 |
||
58720
ae0af9fb3dbb
8232572: Add hooks for custom output dir in Bundles.gmk
erikj
parents:
54380
diff
changeset
|
172 |
ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), ) |
37972 | 173 |
|
174 |
SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map |
|
175 |
||
54380 | 176 |
# There may be files with spaces in the names, so use ShellFindFiles |
177 |
# explicitly. |
|
178 |
ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR)) |
|
37972 | 179 |
|
180 |
# Create special filter rules when dealing with unzipped .dSYM directories on |
|
181 |
# macosx |
|
53683 | 182 |
ifeq ($(call isTargetOs, macosx), true) |
47933
19122c10fc52
8191205: Set native-debug-symbols default to "external"
ihse
parents:
47440
diff
changeset
|
183 |
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
37972 | 184 |
JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \ |
185 |
$(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES)))) |
|
186 |
endif |
|
187 |
endif |
|
188 |
||
189 |
JDK_BUNDLE_FILES := \ |
|
190 |
$(filter-out \ |
|
191 |
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
|
192 |
$(JDK_EXTRA_EXCLUDES) \ |
|
193 |
$(SYMBOLS_EXCLUDE_PATTERN) \ |
|
45097
607a19971bd9
8180129: Bundles.gmk:181: *** unterminated call to function 'filter-out': missing ')'. Stop.
tbell
parents:
45096
diff
changeset
|
194 |
$(JDK_IMAGE_HOMEDIR)/demo/% \ |
37972 | 195 |
, \ |
196 |
$(ALL_JDK_FILES) \ |
|
197 |
) |
|
198 |
JDK_SYMBOLS_BUNDLE_FILES := \ |
|
199 |
$(filter \ |
|
200 |
$(JDK_SYMBOLS_EXCLUDE_PATTERN) \ |
|
201 |
$(SYMBOLS_EXCLUDE_PATTERN) \ |
|
202 |
, \ |
|
39925
719d2be9b4de
8148548: [Linux/Solaris] debuginfo and fastdebuginfo bundle contains demo info
erikj
parents:
39111
diff
changeset
|
203 |
$(filter-out \ |
44724
8efb5c82a573
8173801: Modify makefiles to not build demos and samples bundles.
shurailine
parents:
43051
diff
changeset
|
204 |
$(JDK_IMAGE_HOMEDIR)/demo/% \ |
39925
719d2be9b4de
8148548: [Linux/Solaris] debuginfo and fastdebuginfo bundle contains demo info
erikj
parents:
39111
diff
changeset
|
205 |
, \ |
719d2be9b4de
8148548: [Linux/Solaris] debuginfo and fastdebuginfo bundle contains demo info
erikj
parents:
39111
diff
changeset
|
206 |
$(ALL_JDK_FILES) \ |
719d2be9b4de
8148548: [Linux/Solaris] debuginfo and fastdebuginfo bundle contains demo info
erikj
parents:
39111
diff
changeset
|
207 |
) \ |
37972 | 208 |
) \ |
54380 | 209 |
$(call FindFiles, $(SYMBOLS_IMAGE_DIR)) |
37972 | 210 |
|
47440
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
211 |
TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
212 |
|
54380 | 213 |
ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR)) |
54348 | 214 |
|
215 |
# Create special filter rules when dealing with unzipped .dSYM directories on |
|
216 |
# macosx |
|
217 |
ifeq ($(OPENJDK_TARGET_OS), macosx) |
|
218 |
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
|
219 |
JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \ |
|
220 |
$(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES)))) |
|
221 |
endif |
|
222 |
endif |
|
223 |
||
224 |
JRE_BUNDLE_FILES := $(filter-out \ |
|
225 |
$(JRE_SYMBOLS_EXCLUDE_PATTERN) \ |
|
226 |
$(SYMBOLS_EXCLUDE_PATTERN), \ |
|
227 |
$(ALL_JRE_FILES)) |
|
228 |
||
37972 | 229 |
$(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \ |
230 |
BUNDLE_NAME := $(JDK_BUNDLE_NAME), \ |
|
231 |
FILES := $(JDK_BUNDLE_FILES), \ |
|
232 |
SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \ |
|
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
233 |
BASE_DIRS := $(JDK_IMAGE_DIR), \ |
37972 | 234 |
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
235 |
)) |
|
236 |
||
237 |
PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE) |
|
238 |
||
54348 | 239 |
$(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \ |
240 |
BUNDLE_NAME := $(JRE_BUNDLE_NAME), \ |
|
241 |
FILES := $(JRE_BUNDLE_FILES), \ |
|
242 |
BASE_DIRS := $(JRE_IMAGE_DIR), \ |
|
243 |
SUBDIR := $(JRE_BUNDLE_SUBDIR), \ |
|
244 |
)) |
|
245 |
||
246 |
LEGACY_TARGETS += $(BUILD_JRE_BUNDLE) |
|
247 |
||
37972 | 248 |
$(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ |
249 |
BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ |
|
250 |
FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ |
|
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
251 |
BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \ |
37972 | 252 |
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
253 |
UNZIP_DEBUGINFO := true, \ |
|
254 |
)) |
|
255 |
||
256 |
PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE) |
|
257 |
||
47440
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
258 |
# The demo bundle is only created to support client tests. Ideally it should |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
259 |
# be built with the main test bundle, but since the prerequisites match |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
260 |
# better with the product build, it makes more sense to keep it there for now. |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
261 |
$(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \ |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
262 |
BUNDLE_NAME := $(TEST_DEMOS_BUNDLE_NAME), \ |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
263 |
FILES := $(TEST_DEMOS_BUNDLE_FILES), \ |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
264 |
BASE_DIRS := $(JDK_IMAGE_DIR), \ |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
265 |
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
266 |
)) |
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
267 |
|
963f70aa578d
8189682: JDK demos/tests should be in a separate bundle than hotspot ones
erikj
parents:
47334
diff
changeset
|
268 |
PRODUCT_TARGETS += $(BUILD_TEST_DEMOS_BUNDLE) |
37972 | 269 |
endif |
270 |
||
271 |
################################################################################ |
|
272 |
||
273 |
ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
|
54380 | 274 |
TEST_BUNDLE_FILES := $(call FindFiles, $(TEST_IMAGE_DIR)) |
37972 | 275 |
|
276 |
$(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
|
277 |
BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
|
41875 | 278 |
FILES := $(TEST_BUNDLE_FILES), \ |
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
279 |
BASE_DIRS := $(TEST_IMAGE_DIR), \ |
37972 | 280 |
)) |
281 |
||
282 |
TEST_TARGETS += $(BUILD_TEST_BUNDLE) |
|
283 |
endif |
|
284 |
||
285 |
################################################################################ |
|
286 |
||
287 |
ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), ) |
|
54380 | 288 |
DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR)) |
37972 | 289 |
|
290 |
$(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \ |
|
291 |
BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \ |
|
292 |
FILES := $(DOCS_BUNDLE_FILES), \ |
|
42506
54b0b4fffab5
8170878: JDK 9 fails to build when enabling Hotspot code coverage
erikj
parents:
42136
diff
changeset
|
293 |
BASE_DIRS := $(DOCS_IMAGE_DIR), \ |
37972 | 294 |
SUBDIR := docs, \ |
295 |
)) |
|
296 |
||
297 |
DOCS_TARGETS += $(BUILD_DOCS_BUNDLE) |
|
298 |
endif |
|
299 |
||
300 |
################################################################################ |
|
301 |
||
52774
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
302 |
ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), ) |
54380 | 303 |
JCOV_BUNDLE_FILES := $(call FindFiles, $(JCOV_IMAGE_DIR)) |
52774
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
304 |
|
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
305 |
$(eval $(call SetupBundleFile, BUILD_JCOV_BUNDLE, \ |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
306 |
BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \ |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
307 |
FILES := $(JCOV_BUNDLE_FILES), \ |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
308 |
BASE_DIRS := $(JCOV_IMAGE_DIR), \ |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
309 |
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
310 |
)) |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
311 |
|
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
312 |
JCOV_TARGETS += $(BUILD_JCOV_BUNDLE) |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
313 |
endif |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
314 |
|
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
315 |
################################################################################ |
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
316 |
|
58846
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
317 |
ifneq ($(filter static-libs-bundles, $(MAKECMDGOALS)), ) |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
318 |
STATIC_LIBS_BUNDLE_FILES := $(call FindFiles, $(STATIC_LIBS_IMAGE_DIR)) |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
319 |
|
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
320 |
ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release) |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
321 |
STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_MACOSX_CONTENTS_SUBDIR)/Home |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
322 |
else |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
323 |
STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR) |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
324 |
endif |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
325 |
|
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
326 |
$(eval $(call SetupBundleFile, BUILD_STATIC_LIBS_BUNDLE, \ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
327 |
BUNDLE_NAME := $(STATIC_LIBS_BUNDLE_NAME), \ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
328 |
FILES := $(STATIC_LIBS_BUNDLE_FILES), \ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
329 |
BASE_DIRS := $(STATIC_LIBS_IMAGE_DIR), \ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
330 |
SUBDIR := $(STATIC_LIBS_BUNDLE_SUBDIR), \ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
331 |
)) |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
332 |
|
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
333 |
STATIC_LIBS_TARGETS += $(BUILD_STATIC_LIBS_BUNDLE) |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
334 |
endif |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
335 |
|
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
336 |
################################################################################ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
337 |
|
37972 | 338 |
# Hook to include the corresponding custom file, if present. |
47314 | 339 |
$(eval $(call IncludeCustomExtension, Bundles.gmk)) |
37972 | 340 |
|
341 |
################################################################################ |
|
342 |
||
343 |
product-bundles: $(PRODUCT_TARGETS) |
|
54348 | 344 |
legacy-bundles: $(LEGACY_TARGETS) |
37972 | 345 |
test-bundles: $(TEST_TARGETS) |
346 |
docs-bundles: $(DOCS_TARGETS) |
|
58846
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
347 |
static-libs-bundles: $(STATIC_LIBS_TARGETS) |
52774
56ca125c973b
8214309: Enhance makefiles to allow generating JCov instrumented build
shurailine
parents:
52065
diff
changeset
|
348 |
jcov-bundles: $(JCOV_TARGETS) |
37972 | 349 |
|
58846
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
350 |
.PHONY: all default product-bundles test-bundles docs-bundles \ |
f9ac726ab347
8232748: Build static versions of certain JDK libraries
erikj
parents:
58720
diff
changeset
|
351 |
static-libs-bundles jcov-bundles |