100 |
100 |
101 $(eval $(call SetupExecute, jlink_jre, \ |
101 $(eval $(call SetupExecute, jlink_jre, \ |
102 WARN := Creating legacy jre image, \ |
102 WARN := Creating legacy jre image, \ |
103 DEPS := $(JMODS) $(BASE_RELEASE_FILE) \ |
103 DEPS := $(JMODS) $(BASE_RELEASE_FILE) \ |
104 $(call DependOnVariable, JDK_MODULES_LIST), \ |
104 $(call DependOnVariable, JDK_MODULES_LIST), \ |
105 OUTPUT_DIR := $(JDK_IMAGE_DIR), \ |
105 OUTPUT_DIR := $(JRE_IMAGE_DIR), \ |
106 SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \ |
106 SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \ |
107 PRE_COMMAND := $(RM) -r $(JRE_IMAGE_DIR), \ |
107 PRE_COMMAND := $(RM) -r $(JRE_IMAGE_DIR), \ |
108 COMMAND := $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \ |
108 COMMAND := $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \ |
109 $(JLINK_JRE_EXTRA_OPTS) --output $(JRE_IMAGE_DIR), \ |
109 $(JLINK_JRE_EXTRA_OPTS) --output $(JRE_IMAGE_DIR), \ |
110 )) |
110 )) |
111 |
111 |
112 JLINK_JRE_TARGETS := $(jlink_jre) |
112 JLINK_JRE_TARGETS := $(jlink_jre) |
113 |
113 |
114 ifeq ($(BUILD_CDS_ARCHIVE), true) |
114 ifeq ($(BUILD_CDS_ARCHIVE), true) |
115 CDS_ARCHIVE := lib/server/classes.jsa |
115 ifeq ($(OPENJDK_TARGET_OS), windows) |
|
116 CDS_ARCHIVE := bin/server/classes.jsa |
|
117 else |
|
118 CDS_ARCHIVE := lib/server/classes.jsa |
|
119 endif |
116 |
120 |
117 $(eval $(call SetupExecute, gen_cds_archive_jdk, \ |
121 $(eval $(call SetupExecute, gen_cds_archive_jdk, \ |
118 WARN := Creating CDS archive for jdk image, \ |
122 WARN := Creating CDS archive for jdk image, \ |
119 DEPS := $(jlink_jdk), \ |
123 DEPS := $(jlink_jdk), \ |
120 OUTPUT_FILE := $(JDK_IMAGE_DIR)/$(CDS_ARCHIVE), \ |
124 OUTPUT_FILE := $(JDK_IMAGE_DIR)/$(CDS_ARCHIVE), \ |
132 SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \ |
136 SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \ |
133 COMMAND := $(FIXPATH) $(JRE_IMAGE_DIR)/bin/java -Xshare:dump \ |
137 COMMAND := $(FIXPATH) $(JRE_IMAGE_DIR)/bin/java -Xshare:dump \ |
134 -Xmx128M -Xms128M $(LOG_INFO), \ |
138 -Xmx128M -Xms128M $(LOG_INFO), \ |
135 )) |
139 )) |
136 |
140 |
137 JDK_TARGETS += $(gen_cds_archive_jdk) |
141 JRE_TARGETS += $(gen_cds_archive_jre) |
138 endif |
142 endif |
139 |
143 |
140 ################################################################################ |
144 ################################################################################ |
141 # src.zip |
145 # src.zip |
142 |
146 |
177 ################################################################################ |
181 ################################################################################ |
178 # Code coverage data files |
182 # Code coverage data files |
179 |
183 |
180 ifeq ($(GCOV_ENABLED), true) |
184 ifeq ($(GCOV_ENABLED), true) |
181 |
185 |
182 GCOV_FIND_EXPR := -type f -name "*.gcno" |
186 $(eval $(call SetupCopyFiles,COPY_GCOV_GCNO, \ |
183 |
|
184 $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \ |
|
185 SRC := $(OUTPUTDIR), \ |
187 SRC := $(OUTPUTDIR), \ |
186 DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \ |
188 DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \ |
187 FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR)))) |
189 FILES := $(call FindFiles, $(HOTSPOT_OUTPUTDIR) \ |
188 |
190 $(SUPPORT_OUTPUTDIR)/native, *.gcno) \ |
189 SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO) |
191 )) |
190 |
192 |
191 $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \ |
193 SYMBOLS_TARGETS += $(COPY_GCOV_GCNO) |
192 SRC := $(OUTPUTDIR), \ |
|
193 DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \ |
|
194 FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR)))) |
|
195 |
|
196 SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO) |
|
197 |
194 |
198 endif |
195 endif |
199 |
196 |
200 ################################################################################ |
197 ################################################################################ |
201 # Debug symbols |
198 # Debug symbols |
224 else |
221 else |
225 DEBUGINFO_SUFFIXES := .debuginfo .pdb .map |
222 DEBUGINFO_SUFFIXES := .debuginfo .pdb .map |
226 # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM |
223 # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM |
227 # dirs. |
224 # dirs. |
228 ifeq ($(call isTargetOs, macosx), true) |
225 ifeq ($(call isTargetOs, macosx), true) |
229 $(eval $(call FillCacheFind, \ |
226 $(call FillFindCache, \ |
230 $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs)) |
227 $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs) |
231 FindDebuginfoFiles = \ |
228 FindDebuginfoFiles = \ |
232 $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1))) |
229 $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1))) |
233 endif |
230 endif |
234 endif |
231 endif |
235 |
232 |
236 # Param 1 - either JDK or JRE |
233 # Param 1 - either JDK or JRE |
237 SetupCopyDebuginfo = \ |
234 SetupCopyDebuginfo = \ |