173 endif 174 175 ifneq ($(OPENJDK_TARGET_CPU_ISADIR),) 176 OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)% 177 endif 178 179 $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\ 180 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS))) 181 $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ 182 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS))) 183 $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ 184 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) 185 186 $(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\ 187 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS))) 188 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ 189 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS))) 190 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ 191 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) 192 193 ################################################################################ 194 # /lib dir 195 ifneq ($(OPENJDK_TARGET_OS), macosx) 196 JDKJRE_LIB_FILES := \ 197 $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ 198 $(SALIB_NAME) 199 endif 200 201 ifeq ($(PROFILE),) 202 NOT_JRE_LIB_FILES := \ 203 tools.jar \ 204 jconsole.jar \ 205 sa-jdi.jar \ 206 dt.jar \ 207 orb.idl \ 208 ir.idl \ 209 ct.sym 210 211 ifeq ($(OPENJDK_TARGET_OS), windows) 212 NOT_JRE_LIB_FILES += jawt.lib jvm.lib 713 # Setup a rule for stripping files based on touch files 714 $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/% 715 $(call strip-file) 716 717 $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/% 718 $(call strip-file) 719 720 $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/% 721 $(call strip-file) 722 723 $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/% 724 $(call strip-file) 725 726 endif 727 728 ################################################################################ 729 # Main targets 730 731 jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \ 732 $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ 733 $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) 734 735 jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ 736 $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ 737 $(JDK_IMAGE_DIR)/jre/lib/applet \ 738 $(JDK_DEMO_TARGETS) \ 739 $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ 740 $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ 741 $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ 742 $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ 743 $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ 744 $(JDK_IMAGE_DIR)/src.zip 745 746 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ 747 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) 748 749 jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ 750 $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \ 751 $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \ 752 $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 753 754 ifneq ($(PROFILE),) 755 PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS)) 756 757 PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked 758 759 $(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS) 760 $(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \ 761 $(call profile_name, $(call profile_number, $(PROFILE))) 762 $(TOUCH) $@ 763 764 profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \ | 173 endif 174 175 ifneq ($(OPENJDK_TARGET_CPU_ISADIR),) 176 OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)% 177 endif 178 179 $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\ 180 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS))) 181 $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ 182 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS))) 183 $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ 184 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) 185 186 $(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\ 187 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS))) 188 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ 189 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS))) 190 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ 191 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) 192 193 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 194 define AddIsadirLink 195 # Param 1 - src file 196 # Param 2 - variable to add targets to 197 198 $1_LINK := $$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1) 199 200 $$($1_LINK): 201 $(ECHO) $(LOG_INFO) Creating link $$(patsubst $(OUTPUT_ROOT)/%,%,$$@) 202 $(MKDIR) -p $$(@D) 203 $(LN) -s ../$$(@F) $$@ 204 205 $2 += $$($1_LINK) 206 endef 207 208 $(foreach f,$(JRE_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JRE_BIN_ISADIR_LINK_TARGETS))) 209 $(foreach f,$(JDK_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JDK_BIN_ISADIR_LINK_TARGETS))) 210 $(foreach f,$(JDKJRE_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JDKJRE_BIN_ISADIR_LINK_TARGETS))) 211 endif 212 213 ################################################################################ 214 # /lib dir 215 ifneq ($(OPENJDK_TARGET_OS), macosx) 216 JDKJRE_LIB_FILES := \ 217 $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ 218 $(SALIB_NAME) 219 endif 220 221 ifeq ($(PROFILE),) 222 NOT_JRE_LIB_FILES := \ 223 tools.jar \ 224 jconsole.jar \ 225 sa-jdi.jar \ 226 dt.jar \ 227 orb.idl \ 228 ir.idl \ 229 ct.sym 230 231 ifeq ($(OPENJDK_TARGET_OS), windows) 232 NOT_JRE_LIB_FILES += jawt.lib jvm.lib 733 # Setup a rule for stripping files based on touch files 734 $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/% 735 $(call strip-file) 736 737 $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/% 738 $(call strip-file) 739 740 $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/% 741 $(call strip-file) 742 743 $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/% 744 $(call strip-file) 745 746 endif 747 748 ################################################################################ 749 # Main targets 750 751 jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \ 752 $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ 753 $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \ 754 $(JRE_BIN_ISADIR_LINK_TARGETS) 755 756 jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ 757 $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ 758 $(JDK_IMAGE_DIR)/jre/lib/applet \ 759 $(JDK_DEMO_TARGETS) \ 760 $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ 761 $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ 762 $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ 763 $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ 764 $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ 765 $(JDK_IMAGE_DIR)/src.zip \ 766 $(JDK_BIN_ISADIR_LINK_TARGETS) $(JDKJRE_BIN_ISADIR_LINK_TARGETS) 767 768 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ 769 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) 770 771 jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ 772 $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \ 773 $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \ 774 $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) 775 776 ifneq ($(PROFILE),) 777 PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS)) 778 779 PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked 780 781 $(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS) 782 $(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \ 783 $(call profile_name, $(call profile_number, $(PROFILE))) 784 $(TOUCH) $@ 785 786 profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \ |