make/CreateBuildJdkCopy.gmk

rev 2048 : 8150044: Generate classlists at build-time
Reviewed-by: alanb
Contributed-by: claes.redestad@oracle.com, erik.joelsson@oracle.com

*** 27,37 ****
  
  include $(SPEC)
  include MakeBase.gmk
  include Modules.gmk
  
! MODULES_TO_COPY := $(call FindTransitiveDepsForModule, jdk.jlink) jdk.jlink
  
  ################################################################################
  # Copy the modules needed to run jlink and jmod. Use bulk copy instead of
  # SetupCopyFiles since there are so many files.
  
--- 27,39 ----
  
  include $(SPEC)
  include MakeBase.gmk
  include Modules.gmk
  
! MODULES_TO_COPY := $(sort \
!     $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
!       $(call FindTransitiveDepsForModule, $m) $m))
  
  ################################################################################
  # Copy the modules needed to run jlink and jmod. Use bulk copy instead of
  # SetupCopyFiles since there are so many files.
  
*** 47,65 ****
                  $(BUILDJDK_OUTPUTDIR)/jdk/modules/ $(NEWLINE))
          $(TOUCH) $@
  
  TARGETS += $(COPY_CLASSES_TARGET)
  
- #$(eval $(call SetupCopyFiles, COPY_JDK_MODULES, \
-     SRC := $(BUILD_OUTPUT), \
-     DEST := $(BUILDJDK_OUTPUTDIR), \
-     FILES := $(call DoubleDollar, $(call DoubleDollar, $(call CacheFind, $(wildcard \
-         $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY)))))), \
- ))
- 
- #TARGETS += $(COPY_JDK_MODULES)
- 
  ################################################################################
  
  $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
      SRC := $(BUILD_OUTPUT), \
      DEST := $(BUILDJDK_OUTPUTDIR), \
--- 49,58 ----