make/MacBundles.gmk

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

*** 1,7 ****
  #
! # Copyright (c) 2011, 2017, 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) 2011, 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
*** 50,66 ****
    endif
  
    $(eval $(call SetupCopyFiles, COPY_JDK_IMAGE, \
        SRC := $(JDK_IMAGE_DIR), \
        DEST := $(JDK_MACOSX_CONTENTS_DIR)/Home, \
!       FILES := $(call CacheFind, $(JDK_IMAGE_DIR)), \
    ))
  
    $(eval $(call SetupCopyFiles, COPY_JRE_IMAGE, \
        SRC := $(JRE_IMAGE_DIR), \
        DEST := $(JRE_MACOSX_CONTENTS_DIR)/Home, \
!       FILES := $(call CacheFind, $(JRE_IMAGE_DIR)), \
    ))
  
     $(eval $(call SetupCopyFiles, COPY_LIBJLI_JDK, \
        FILES := $(JDK_IMAGE_DIR)/lib/jli/libjli.dylib, \
        DEST := $(JDK_MACOSX_CONTENTS_DIR)/MacOS, \
--- 50,66 ----
    endif
  
    $(eval $(call SetupCopyFiles, COPY_JDK_IMAGE, \
        SRC := $(JDK_IMAGE_DIR), \
        DEST := $(JDK_MACOSX_CONTENTS_DIR)/Home, \
!       FILES := $(call FindFiles, $(JDK_IMAGE_DIR)), \
    ))
  
    $(eval $(call SetupCopyFiles, COPY_JRE_IMAGE, \
        SRC := $(JRE_IMAGE_DIR), \
        DEST := $(JRE_MACOSX_CONTENTS_DIR)/Home, \
!       FILES := $(call FindFiles, $(JRE_IMAGE_DIR)), \
    ))
  
     $(eval $(call SetupCopyFiles, COPY_LIBJLI_JDK, \
        FILES := $(JDK_IMAGE_DIR)/lib/jli/libjli.dylib, \
        DEST := $(JDK_MACOSX_CONTENTS_DIR)/MacOS, \