equal
deleted
inserted
replaced
70 |
70 |
71 $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) |
71 $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) |
72 |
72 |
73 $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) |
73 $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) |
74 $$(call MakeTargetDir) |
74 $$(call MakeTargetDir) |
75 # If any of the files contain a space in the file name, CacheFind |
75 # If any of the files contain a space in the file name, FindFiles |
76 # will have replaced it with ?. Tar does not accept that so need to |
76 # will have replaced it with ?. Tar does not accept that so need to |
77 # switch it back. |
77 # switch it back. |
78 $$(foreach d, $$($1_BASE_DIRS), \ |
78 $$(foreach d, $$($1_BASE_DIRS), \ |
79 $$(eval $$(call ListPathsSafely, \ |
79 $$(eval $$(call ListPathsSafely, \ |
80 $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \ |
80 $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \ |
164 endif |
164 endif |
165 |
165 |
166 ################################################################################ |
166 ################################################################################ |
167 |
167 |
168 ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), ) |
168 ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), ) |
169 $(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR))) |
|
170 |
169 |
171 SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map |
170 SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map |
172 |
171 |
173 ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR)) |
172 # There may be files with spaces in the names, so use ShellFindFiles |
|
173 # explicitly. |
|
174 ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR)) |
174 |
175 |
175 # Create special filter rules when dealing with unzipped .dSYM directories on |
176 # Create special filter rules when dealing with unzipped .dSYM directories on |
176 # macosx |
177 # macosx |
177 ifeq ($(call isTargetOs, macosx), true) |
178 ifeq ($(call isTargetOs, macosx), true) |
178 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
179 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
199 $(JDK_IMAGE_HOMEDIR)/demo/% \ |
200 $(JDK_IMAGE_HOMEDIR)/demo/% \ |
200 , \ |
201 , \ |
201 $(ALL_JDK_FILES) \ |
202 $(ALL_JDK_FILES) \ |
202 ) \ |
203 ) \ |
203 ) \ |
204 ) \ |
204 $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) |
205 $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) |
205 |
206 |
206 TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) |
207 TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES)) |
207 |
208 |
208 ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR)) |
209 ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR)) |
209 |
210 |
210 # Create special filter rules when dealing with unzipped .dSYM directories on |
211 # Create special filter rules when dealing with unzipped .dSYM directories on |
211 # macosx |
212 # macosx |
212 ifeq ($(OPENJDK_TARGET_OS), macosx) |
213 ifeq ($(OPENJDK_TARGET_OS), macosx) |
213 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
214 ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false) |
264 endif |
265 endif |
265 |
266 |
266 ################################################################################ |
267 ################################################################################ |
267 |
268 |
268 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
269 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), ) |
269 TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR)) |
270 TEST_BUNDLE_FILES := $(call FindFiles, $(TEST_IMAGE_DIR)) |
270 |
271 |
271 $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
272 $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ |
272 BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
273 BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ |
273 FILES := $(TEST_BUNDLE_FILES), \ |
274 FILES := $(TEST_BUNDLE_FILES), \ |
274 BASE_DIRS := $(TEST_IMAGE_DIR), \ |
275 BASE_DIRS := $(TEST_IMAGE_DIR), \ |
278 endif |
279 endif |
279 |
280 |
280 ################################################################################ |
281 ################################################################################ |
281 |
282 |
282 ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), ) |
283 ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), ) |
283 DOCS_BUNDLE_FILES := $(call CacheFind, $(DOCS_IMAGE_DIR)) |
284 DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR)) |
284 |
285 |
285 $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \ |
286 $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \ |
286 BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \ |
287 BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \ |
287 FILES := $(DOCS_BUNDLE_FILES), \ |
288 FILES := $(DOCS_BUNDLE_FILES), \ |
288 BASE_DIRS := $(DOCS_IMAGE_DIR), \ |
289 BASE_DIRS := $(DOCS_IMAGE_DIR), \ |
293 endif |
294 endif |
294 |
295 |
295 ################################################################################ |
296 ################################################################################ |
296 |
297 |
297 ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), ) |
298 ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), ) |
298 JCOV_BUNDLE_FILES := $(call CacheFind, $(JCOV_IMAGE_DIR)) |
299 JCOV_BUNDLE_FILES := $(call FindFiles, $(JCOV_IMAGE_DIR)) |
299 |
300 |
300 $(eval $(call SetupBundleFile, BUILD_JCOV_BUNDLE, \ |
301 $(eval $(call SetupBundleFile, BUILD_JCOV_BUNDLE, \ |
301 BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \ |
302 BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \ |
302 FILES := $(JCOV_BUNDLE_FILES), \ |
303 FILES := $(JCOV_BUNDLE_FILES), \ |
303 BASE_DIRS := $(JCOV_IMAGE_DIR), \ |
304 BASE_DIRS := $(JCOV_IMAGE_DIR), \ |