247 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS))) 248 $(foreach f,$(JDK_JDKOUT_LIB_LIST),\ 249 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS))) 250 $(foreach f,$(JDKJRE_JDKOUT_LIB_LIST),\ 251 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS))) 252 253 $(foreach f,$(JRE_IMAGES_LIB_LIST),\ 254 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS))) 255 $(foreach f,$(JDK_IMAGES_LIB_LIST),\ 256 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS))) 257 $(foreach f,$(JDKJRE_IMAGES_LIB_LIST),\ 258 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS))) 259 260 $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)),\ 261 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS))) 262 $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)),\ 263 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS))) 264 $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)),\ 265 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS))) 266 267 # CTE plugin security change require new empty directory lib/applet 268 $(JRE_IMAGE_DIR)/lib/applet: 269 $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 270 $(MKDIR) -p $@ 271 272 $(JDK_IMAGE_DIR)/jre/lib/applet: 273 $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 274 $(MKDIR) -p $@ 275 276 # In the old build, JObjC.jar is not part of the meta-index 277 $(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS) 278 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 279 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'` 280 281 $(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS) 282 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 283 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'` 284 285 $(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS) 286 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 721 jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ 722 $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ 723 $(JDK_IMAGE_DIR)/jre/lib/applet \ 724 $(JDK_DEMO_TARGETS) \ 725 $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ 726 $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ 727 $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ 728 $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ 729 $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ 730 $(JDK_IMAGE_DIR)/src.zip 731 732 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ 733 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) 734 735 jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ 736 $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \ 737 $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \ 738 $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 739 740 ifneq ($(PROFILE),) 741 # Files in lib$(PROFILE) are excluded from the generic copying routines so 742 # we have to add them back in here 743 $(foreach f,$(CUSTOM_PROFILE_JARS),\ 744 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS))) 745 746 PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS)) 747 748 PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked 749 750 $(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS) 751 $(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \ 752 $(call profile_name, $(call profile_number, $(PROFILE))) 753 $(TOUCH) $@ 754 755 profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \ 756 $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ 757 $(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED) 758 759 .PHONY: profile-image 760 761 endif # Profile 762 763 ################################################################################ 764 765 .PHONY: default images jre-image jdk-image | 247 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS))) 248 $(foreach f,$(JDK_JDKOUT_LIB_LIST),\ 249 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS))) 250 $(foreach f,$(JDKJRE_JDKOUT_LIB_LIST),\ 251 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS))) 252 253 $(foreach f,$(JRE_IMAGES_LIB_LIST),\ 254 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS))) 255 $(foreach f,$(JDK_IMAGES_LIB_LIST),\ 256 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS))) 257 $(foreach f,$(JDKJRE_IMAGES_LIB_LIST),\ 258 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS))) 259 260 $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)),\ 261 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS))) 262 $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)),\ 263 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS))) 264 $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)),\ 265 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS))) 266 267 ifneq ($(PROFILE),) 268 # Files in lib$(PROFILE) are excluded from the generic copying routines so 269 # we have to add them back in here 270 $(foreach f,$(CUSTOM_PROFILE_JARS),\ 271 $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS))) 272 endif 273 274 # CTE plugin security change require new empty directory lib/applet 275 $(JRE_IMAGE_DIR)/lib/applet: 276 $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 277 $(MKDIR) -p $@ 278 279 $(JDK_IMAGE_DIR)/jre/lib/applet: 280 $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 281 $(MKDIR) -p $@ 282 283 # In the old build, JObjC.jar is not part of the meta-index 284 $(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS) 285 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 286 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'` 287 288 $(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS) 289 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 290 $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index `$(LS) *.jar | $(SED) 's/JObjC\.jar//g'` 291 292 $(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS) 293 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) 728 jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ 729 $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ 730 $(JDK_IMAGE_DIR)/jre/lib/applet \ 731 $(JDK_DEMO_TARGETS) \ 732 $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ 733 $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ 734 $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ 735 $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ 736 $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ 737 $(JDK_IMAGE_DIR)/src.zip 738 739 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ 740 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) 741 742 jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ 743 $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \ 744 $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \ 745 $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 746 747 ifneq ($(PROFILE),) 748 PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS)) 749 750 PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked 751 752 $(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS) 753 $(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \ 754 $(call profile_name, $(call profile_number, $(PROFILE))) 755 $(TOUCH) $@ 756 757 profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \ 758 $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ 759 $(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED) 760 761 .PHONY: profile-image 762 763 endif # Profile 764 765 ################################################################################ 766 767 .PHONY: default images jre-image jdk-image |