make/Images.gmk
changeset 41874 07c3c4f1eb63
parent 41532 76dffc133464
child 41875 854ef5325653
equal deleted inserted replaced
41873:dc31fca4f71d 41874:07c3c4f1eb63
   111 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
   111 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
   112 
   112 
   113 JLINK_ORDER_RESOURCES := **module-info.class
   113 JLINK_ORDER_RESOURCES := **module-info.class
   114 JLINK_JLI_CLASSES :=
   114 JLINK_JLI_CLASSES :=
   115 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   115 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   116   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
   116   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/link_opt/classlist
   117   JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
   117   JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/link_opt/jli_trace.out
   118 endif
   118 endif
   119 JLINK_ORDER_RESOURCES += \
   119 JLINK_ORDER_RESOURCES += \
   120     /java.base/java/** \
   120     /java.base/java/** \
   121     /java.base/jdk/** \
   121     /java.base/jdk/** \
   122     /java.base/sun/** \
   122     /java.base/sun/** \
   140 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
   140 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
   141     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
   141     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
   142 	$(ECHO) Creating jdk jimage
   142 	$(ECHO) Creating jdk jimage
   143 	$(RM) -r $(JDK_IMAGE_DIR)
   143 	$(RM) -r $(JDK_IMAGE_DIR)
   144 	$(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
   144 	$(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
   145  	    $(JLINK_JDK_EXTRA_OPTS) \
   145 	    $(JLINK_JDK_EXTRA_OPTS) \
   146 	    --output $(JDK_IMAGE_DIR)
   146 	    --output $(JDK_IMAGE_DIR)
   147 	$(TOUCH) $@
   147 	$(TOUCH) $@
   148 
   148 
   149 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
   149 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
   150     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
   150     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
   151 	$(ECHO) Creating jre jimage
   151 	$(ECHO) Creating jre jimage
   152 	$(RM) -r $(JRE_IMAGE_DIR)
   152 	$(RM) -r $(JRE_IMAGE_DIR)
   153 	$(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
   153 	$(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
   154 	    $(JLINK_JRE_EXTRA_OPTS) \
   154 	    $(JLINK_JRE_EXTRA_OPTS) \
   155  	    --output $(JRE_IMAGE_DIR)
   155 	    --output $(JRE_IMAGE_DIR)
   156 	$(TOUCH) $@
   156 	$(TOUCH) $@
   157 
   157 
   158 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
   158 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
   159 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
   159 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
   160 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
   160 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
   358 	$(install-file)
   358 	$(install-file)
   359 
   359 
   360 JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
   360 JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
   361 
   361 
   362 ################################################################################
   362 ################################################################################
   363 # classlist
       
   364 
       
   365 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
       
   366   $(eval $(call SetupCopyFiles, JDK_COPY_CLASSLIST, \
       
   367       FILES := $(SUPPORT_OUTPUTDIR)/classlist/classlist, \
       
   368       DEST := $(JDK_IMAGE_DIR)/lib, \
       
   369   ))
       
   370 
       
   371   JDK_TARGETS += $(JDK_COPY_CLASSLIST)
       
   372 
       
   373   $(eval $(call SetupCopyFiles, JRE_COPY_CLASSLIST, \
       
   374       FILES := $(SUPPORT_OUTPUTDIR)/classlist/classlist, \
       
   375       DEST := $(JRE_IMAGE_DIR)/lib, \
       
   376   ))
       
   377 
       
   378   JRE_TARGETS += $(JRE_COPY_CLASSLIST)
       
   379 endif
       
   380 
       
   381 ################################################################################
       
   382 # /demo dir
   363 # /demo dir
   383 # Avoid doing the expensive find unless called with "jdk" as target.
   364 # Avoid doing the expensive find unless called with "jdk" as target.
   384 ifneq ($(filter jdk, $(MAKECMDGOALS)), )
   365 ifneq ($(filter jdk, $(MAKECMDGOALS)), )
   385 
   366 
   386   DEMO_FILES := \
   367   DEMO_FILES := \