make/CreateJmods.gmk

rev 52919 : 8189861: Refactor CacheFind
Reviewed-by: sgehwolf

*** 49,85 ****
  INCLUDE_HEADERS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
      $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS))))
  MAN_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
      $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
  
! $(eval $(call FillCacheFind, \
      $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
! ))
  
  ifneq ($(LIBS_DIR), )
    JMOD_FLAGS += --libs $(LIBS_DIR)
!   DEPS += $(call CacheFind, $(LIBS_DIR))
  endif
  ifneq ($(CMDS_DIR), )
    JMOD_FLAGS += --cmds $(CMDS_DIR)
!   DEPS += $(call CacheFind, $(CMDS_DIR))
  endif
  ifneq ($(CONF_DIR), )
    JMOD_FLAGS += --config $(CONF_DIR)
!   DEPS += $(call CacheFind, $(CONF_DIR))
  endif
  ifneq ($(CLASSES_DIR), )
    JMOD_FLAGS += --class-path $(CLASSES_DIR)
!   DEPS += $(call CacheFind, $(CLASSES_DIR))
  endif
  ifneq ($(INCLUDE_HEADERS_DIR), )
    JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR)
!   DEPS += $(call CacheFind, $(INCLUDE_HEADERS_DIR))
  endif
  ifneq ($(MAN_DIR), )
    JMOD_FLAGS += --man-pages $(MAN_DIR)
!   DEPS += $(call CacheFind, $(MAN_DIR))
  endif
  
  # If a specific modules_legal dir exists for this module, only pick up files
  # from there. These files were explicitly filtered or modified in <module>-copy
  # targets. For the rest, just pick up everything from the source legal dirs.
--- 49,85 ----
  INCLUDE_HEADERS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
      $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS))))
  MAN_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
      $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
  
! $(call FillFindCache, \
      $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
! )
  
  ifneq ($(LIBS_DIR), )
    JMOD_FLAGS += --libs $(LIBS_DIR)
!   DEPS += $(call FindFiles, $(LIBS_DIR))
  endif
  ifneq ($(CMDS_DIR), )
    JMOD_FLAGS += --cmds $(CMDS_DIR)
!   DEPS += $(call FindFiles, $(CMDS_DIR))
  endif
  ifneq ($(CONF_DIR), )
    JMOD_FLAGS += --config $(CONF_DIR)
!   DEPS += $(call FindFiles, $(CONF_DIR))
  endif
  ifneq ($(CLASSES_DIR), )
    JMOD_FLAGS += --class-path $(CLASSES_DIR)
!   DEPS += $(call FindFiles, $(CLASSES_DIR))
  endif
  ifneq ($(INCLUDE_HEADERS_DIR), )
    JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR)
!   DEPS += $(call FindFiles, $(INCLUDE_HEADERS_DIR))
  endif
  ifneq ($(MAN_DIR), )
    JMOD_FLAGS += --man-pages $(MAN_DIR)
!   DEPS += $(call FindFiles, $(MAN_DIR))
  endif
  
  # If a specific modules_legal dir exists for this module, only pick up files
  # from there. These files were explicitly filtered or modified in <module>-copy
  # targets. For the rest, just pick up everything from the source legal dirs.
*** 89,99 ****
        $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \
        $(call FindModuleLegalSrcDirs, $(MODULE)) \
      )
  
  LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
! DEPS += $(call CacheFind, $(LEGAL_NOTICES))
  
  JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
  
  ifeq ($(filter-out jdk.incubator.%, $(MODULE)), )
    JMOD_FLAGS += --do-not-resolve-by-default
--- 89,99 ----
        $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \
        $(call FindModuleLegalSrcDirs, $(MODULE)) \
      )
  
  LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
! DEPS += $(call FindFiles, $(LEGAL_NOTICES))
  
  JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
  
  ifeq ($(filter-out jdk.incubator.%, $(MODULE)), )
    JMOD_FLAGS += --do-not-resolve-by-default
*** 143,153 ****
  # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
  # The variable JMOD_CMD could contain an environment variable assignment before
  # the actual command. Filter that out using wildcard before adding to DEPS.
  DEPS += $(wildcard $(JMOD_CMD))
  ifeq ($(EXTERNAL_BUILDJDK), false)
!   DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
  endif
  
  # If creating interim versions of jmods, certain files need to be filtered out
  # to avoid false incremental rebuilds.
  ifeq ($(INTERIM_JMOD), true)
--- 143,153 ----
  # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
  # The variable JMOD_CMD could contain an environment variable assignment before
  # the actual command. Filter that out using wildcard before adding to DEPS.
  DEPS += $(wildcard $(JMOD_CMD))
  ifeq ($(EXTERNAL_BUILDJDK), false)
!   DEPS += $(call FindFiles, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
  endif
  
  # If creating interim versions of jmods, certain files need to be filtered out
  # to avoid false incremental rebuilds.
  ifeq ($(INTERIM_JMOD), true)