< prev index next >
make/Bundles.gmk
Print this page
rev 52919 : 8189861: Refactor CacheFind
Reviewed-by: sgehwolf
@@ -69,11 +69,11 @@
endif
$$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
$(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
- # If any of the files contain a space in the file name, CacheFind
+ # If any of the files contain a space in the file name, FindFiles
# will have replaced it with ?. Tar does not accept that so need to
# switch it back.
$$(foreach d, $$($1_BASE_DIRS), \
$$(eval $$(call ListPathsSafely, \
$1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \
@@ -164,15 +164,16 @@
endif
################################################################################
ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
- $(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR)))
SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map
- ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR))
+ # There may be files with spaces in the names, so use ShellFindFiles
+ # explicitly.
+ ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
# Create special filter rules when dealing with unzipped .dSYM directories on
# macosx
ifeq ($(OPENJDK_TARGET_OS), macosx)
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
@@ -199,15 +200,15 @@
$(JDK_IMAGE_HOMEDIR)/demo/% \
, \
$(ALL_JDK_FILES) \
) \
) \
- $(call CacheFind, $(SYMBOLS_IMAGE_DIR))
+ $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
- ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
+ ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
# Create special filter rules when dealing with unzipped .dSYM directories on
# macosx
ifeq ($(OPENJDK_TARGET_OS), macosx)
ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
@@ -336,11 +337,11 @@
endif
################################################################################
ifneq ($(filter test-bundles, $(MAKECMDGOALS)), )
- TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR))
+ TEST_BUNDLE_FILES := $(call FindFiles, $(TEST_IMAGE_DIR))
$(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \
BUNDLE_NAME := $(TEST_BUNDLE_NAME), \
FILES := $(TEST_BUNDLE_FILES), \
BASE_DIRS := $(TEST_IMAGE_DIR), \
@@ -350,11 +351,11 @@
endif
################################################################################
ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), )
- DOCS_BUNDLE_FILES := $(call CacheFind, $(DOCS_IMAGE_DIR))
+ DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR))
$(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \
BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \
FILES := $(DOCS_BUNDLE_FILES), \
BASE_DIRS := $(DOCS_IMAGE_DIR), \
< prev index next >