make/CreateBuildJdkCopy.gmk

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

*** 1,7 ****
  #
! # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 37,47 ****
  # Copy the modules needed to run jlink and jmod. Use bulk copy instead of
  # SetupCopyFiles since there are so many files.
  
  COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
  
! $(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \
      $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
          $(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)"
          $(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
          $(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
          $(foreach m, $(MODULES_TO_COPY), \
--- 37,47 ----
  # Copy the modules needed to run jlink and jmod. Use bulk copy instead of
  # SetupCopyFiles since there are so many files.
  
  COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
  
! $(COPY_CLASSES_TARGET): $(call FindFiles, $(wildcard \
      $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
          $(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)"
          $(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
          $(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
          $(foreach m, $(MODULES_TO_COPY), \
*** 54,64 ****
  ################################################################################
  
  $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
      SRC := $(OUTPUTDIR), \
      DEST := $(BUILDJDK_OUTPUTDIR), \
!     FILES := $(call CacheFind, $(wildcard \
          $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
  ))
  
  TARGETS += $(COPY_SUPPORT_HEADERS)
  
--- 54,64 ----
  ################################################################################
  
  $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
      SRC := $(OUTPUTDIR), \
      DEST := $(BUILDJDK_OUTPUTDIR), \
!     FILES := $(call FindFiles, $(wildcard \
          $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
  ))
  
  TARGETS += $(COPY_SUPPORT_HEADERS)