1 # |
1 # |
2 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
188 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ |
188 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ |
189 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS))) |
189 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS))) |
190 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ |
190 $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ |
191 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) |
191 $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) |
192 |
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 |
193 ################################################################################ |
213 ################################################################################ |
194 # /lib dir |
214 # /lib dir |
195 ifneq ($(OPENJDK_TARGET_OS), macosx) |
215 ifneq ($(OPENJDK_TARGET_OS), macosx) |
196 JDKJRE_LIB_FILES := \ |
216 JDKJRE_LIB_FILES := \ |
197 $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ |
217 $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ |
733 ################################################################################ |
753 ################################################################################ |
734 # Main targets |
754 # Main targets |
735 |
755 |
736 jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \ |
756 jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \ |
737 $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ |
757 $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ |
738 $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) |
758 $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \ |
|
759 $(JRE_BIN_ISADIR_LINK_TARGETS) |
739 |
760 |
740 jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ |
761 jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ |
741 $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ |
762 $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ |
742 $(JDK_IMAGE_DIR)/jre/lib/applet \ |
763 $(JDK_IMAGE_DIR)/jre/lib/applet \ |
743 $(JDK_DEMO_TARGETS) \ |
764 $(JDK_DEMO_TARGETS) \ |
744 $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ |
765 $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ |
745 $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ |
766 $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ |
746 $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ |
767 $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ |
747 $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ |
768 $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ |
748 $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ |
769 $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ |
749 $(JDK_IMAGE_DIR)/src.zip |
770 $(JDK_IMAGE_DIR)/src.zip \ |
|
771 $(JDK_BIN_ISADIR_LINK_TARGETS) $(JDKJRE_BIN_ISADIR_LINK_TARGETS) |
750 |
772 |
751 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ |
773 jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ |
752 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) |
774 $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) |
753 |
775 |
754 jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ |
776 jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ |