129 --release-info $(BASE_RELEASE_FILE) \ |
129 --release-info $(BASE_RELEASE_FILE) \ |
130 --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ |
130 --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ |
131 $(JLINK_JLI_CLASSES) \ |
131 $(JLINK_JLI_CLASSES) \ |
132 # |
132 # |
133 |
133 |
|
134 JLINK_JRE_EXTRA_OPTS := --no-man-pages --no-header-files |
|
135 |
134 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true) |
136 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true) |
135 JLINK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods |
137 JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods |
136 endif |
138 endif |
137 |
139 |
138 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
140 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
139 $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE) |
141 $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE) |
140 $(ECHO) Creating jdk jimage |
142 $(ECHO) Creating jdk jimage |
141 $(RM) -r $(JDK_IMAGE_DIR) |
143 $(RM) -r $(JDK_IMAGE_DIR) |
142 $(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \ |
144 $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \ |
143 --add-modules $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS) |
145 $(JLINK_JDK_EXTRA_OPTS) \ |
|
146 --output $(JDK_IMAGE_DIR) |
144 $(TOUCH) $@ |
147 $(TOUCH) $@ |
145 |
148 |
146 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
149 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
147 $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE) |
150 $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE) |
148 $(ECHO) Creating jre jimage |
151 $(ECHO) Creating jre jimage |
149 $(RM) -r $(JRE_IMAGE_DIR) |
152 $(RM) -r $(JRE_IMAGE_DIR) |
150 $(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \ |
153 $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \ |
151 --add-modules $(JRE_MODULES_LIST) |
154 $(JLINK_JRE_EXTRA_OPTS) \ |
|
155 --output $(JRE_IMAGE_DIR) |
152 $(TOUCH) $@ |
156 $(TOUCH) $@ |
153 |
157 |
154 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1 |
158 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1 |
155 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2 |
159 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2 |
156 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3 |
160 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3 |
|
161 |
157 |
162 |
158 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
163 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
159 $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE) |
164 $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE) |
160 $(ECHO) Creating jre compact1 jimage |
165 $(ECHO) Creating jre compact1 jimage |
161 $(RM) -r $(JRE_COMPACT1_IMAGE_DIR) |
166 $(RM) -r $(JRE_COMPACT1_IMAGE_DIR) |
162 $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \ |
167 $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \ |
|
168 $(JLINK_JRE_EXTRA_OPTS) \ |
163 --output $(JRE_COMPACT1_IMAGE_DIR) |
169 --output $(JRE_COMPACT1_IMAGE_DIR) |
164 $(TOUCH) $@ |
170 $(TOUCH) $@ |
165 |
171 |
166 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
172 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
167 $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE) |
173 $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE) |
168 $(ECHO) Creating jre compact2 jimage |
174 $(ECHO) Creating jre compact2 jimage |
169 $(RM) -r $(JRE_COMPACT2_IMAGE_DIR) |
175 $(RM) -r $(JRE_COMPACT2_IMAGE_DIR) |
170 $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \ |
176 $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \ |
|
177 $(JLINK_JRE_EXTRA_OPTS) \ |
171 --output $(JRE_COMPACT2_IMAGE_DIR) |
178 --output $(JRE_COMPACT2_IMAGE_DIR) |
172 $(TOUCH) $@ |
179 $(TOUCH) $@ |
173 |
180 |
174 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
181 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
175 $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE) |
182 $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE) |
176 $(ECHO) Creating jre compact3 jimage |
183 $(ECHO) Creating jre compact3 jimage |
177 $(RM) -r $(JRE_COMPACT3_IMAGE_DIR) |
184 $(RM) -r $(JRE_COMPACT3_IMAGE_DIR) |
178 $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \ |
185 $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \ |
|
186 $(JLINK_JRE_EXTRA_OPTS) \ |
179 --output $(JRE_COMPACT3_IMAGE_DIR) |
187 --output $(JRE_COMPACT3_IMAGE_DIR) |
180 $(TOUCH) $@ |
188 $(TOUCH) $@ |
181 |
189 |
182 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
190 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
183 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
191 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
311 JRE_TARGETS += $(JRE_MAN_PAGE_LIST) |
319 JRE_TARGETS += $(JRE_MAN_PAGE_LIST) |
312 JDK_TARGETS += $(JDK_MAN_PAGE_LIST) |
320 JDK_TARGETS += $(JDK_MAN_PAGE_LIST) |
313 endif # Windows |
321 endif # Windows |
314 |
322 |
315 ################################################################################ |
323 ################################################################################ |
316 # /include dir |
|
317 |
|
318 $(eval $(call SetupCopyFiles,COPY_INCLUDES, \ |
|
319 SRC := $(JDK_OUTPUTDIR)/include, \ |
|
320 DEST := $(JDK_IMAGE_DIR)/include, \ |
|
321 FILES := $(call CacheFind,$(JDK_OUTPUTDIR)/include))) |
|
322 |
|
323 JDK_TARGETS += $(COPY_INCLUDES) |
|
324 |
|
325 ################################################################################ |
|
326 # doc files |
324 # doc files |
327 |
325 |
328 JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
326 JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
329 JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
327 JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README |
330 JRE_DOC_LOCATION ?= $(JDK_TOPDIR) |
328 JRE_DOC_LOCATION ?= $(JDK_TOPDIR) |