jdk/make/Images.gmk
changeset 23602 ff671719d44a
parent 23601 d15e005afb07
child 25859 3317bb8137f4
equal deleted inserted replaced
23601:d15e005afb07 23602:ff671719d44a
   299 	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   299 	$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   300 	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
   300 	$(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar
   301 
   301 
   302 ################################################################################
   302 ################################################################################
   303 # /man dir
   303 # /man dir
       
   304 #
       
   305 # All variables in this section are assigned with simple =, without :, to enable
       
   306 # more selective overriding from the custom version of this file.
       
   307 #
   304 # Avoid evaluating this whole section on windows for speed and stability
   308 # Avoid evaluating this whole section on windows for speed and stability
   305 ifneq ($(OPENJDK_TARGET_OS), windows)
   309 ifneq ($(OPENJDK_TARGET_OS), windows)
   306   JRE_MAN_PAGES := \
   310   JRE_MAN_PAGES = \
   307       java.1 \
   311       java.1 \
   308       jjs.1 \
   312       jjs.1 \
   309       keytool.1 \
   313       keytool.1 \
   310       orbd.1 \
   314       orbd.1 \
   311       pack200.1 \
   315       pack200.1 \
   352       serialver.1 \
   356       serialver.1 \
   353       wsgen.1 \
   357       wsgen.1 \
   354       wsimport.1 \
   358       wsimport.1 \
   355       xjc.1
   359       xjc.1
   356 
   360 
   357   ifndef OPENJDK
       
   358     JDK_MAN_PAGES += \
       
   359         jvisualvm.1 \
       
   360         jmc.1 \
       
   361         #
       
   362   endif
       
   363 
       
   364   # This variable is potentially overridden in the closed makefile.
   361   # This variable is potentially overridden in the closed makefile.
   365   MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
   362   MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
   366 
   363 
   367   ifeq ($(OPENJDK_TARGET_OS), linux)
   364   ifeq ($(OPENJDK_TARGET_OS), linux)
   368     MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/linux/doc
   365     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
   369     MAN1_SUBDIR := man
   366     MAN1_SUBDIR = man
   370   endif
   367   endif
   371   ifeq ($(OPENJDK_TARGET_OS), solaris)
   368   ifeq ($(OPENJDK_TARGET_OS), solaris)
   372     MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/solaris/doc
   369     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
   373     MAN1_SUBDIR := sun/man/man1
   370     MAN1_SUBDIR = sun/man/man1
   374     JDK_MAN_PAGES := $(filter-out jmc.1, $(JDK_MAN_PAGES))
       
   375   endif
   371   endif
   376   ifeq ($(OPENJDK_TARGET_OS), macosx)
   372   ifeq ($(OPENJDK_TARGET_OS), macosx)
   377     MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/bsd/doc
   373     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
   378     MAN1_SUBDIR := man
   374     MAN1_SUBDIR = man
   379   endif
   375   endif
   380 
   376 
   381   $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
   377   $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
   382 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   378 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   383 	$(install-file)
   379 	$(install-file)
   448 	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   444 	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   449 	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
   445 	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
   450   endif
   446   endif
   451 
   447 
   452   ifeq ($(OPENJDK_TARGET_OS), linux)
   448   ifeq ($(OPENJDK_TARGET_OS), linux)
   453     JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   449     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   454         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
   450         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
   455         $(JRE_IMAGE_DIR)/man/ja
   451         $(JRE_IMAGE_DIR)/man/ja
   456 
   452 
   457     JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
   453     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
   458         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
   454         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
   459         $(JDK_IMAGE_DIR)/man/ja
   455         $(JDK_IMAGE_DIR)/man/ja
   460   endif
   456   endif
   461 
   457 
   462   ifeq ($(OPENJDK_TARGET_OS), solaris)
   458   ifeq ($(OPENJDK_TARGET_OS), solaris)
   463     JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   459     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   464         $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
   460         $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
   465         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
   461         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
   466         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
   462         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
   467 
   463 
   468     JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
   464     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
   469         $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
   465         $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
   470         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
   466         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
   471         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
   467         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
   472   endif
   468   endif
   473 
   469 
   474   ifeq ($(OPENJDK_TARGET_OS), macosx)
   470   ifeq ($(OPENJDK_TARGET_OS), macosx)
   475     JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   471     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   476         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
   472         $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
   477         $(JRE_IMAGE_DIR)/man/ja
   473         $(JRE_IMAGE_DIR)/man/ja
   478 
   474 
   479     JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
   475     JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
   480         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
   476         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
   481         $(JDK_IMAGE_DIR)/man/ja
   477         $(JDK_IMAGE_DIR)/man/ja
   482   endif
   478   endif
   483 
   479 
   484 endif # Windows
   480 endif # Windows
   729 	$(call strip-file)
   725 	$(call strip-file)
   730 
   726 
   731 endif
   727 endif
   732 
   728 
   733 ################################################################################
   729 ################################################################################
       
   730 
       
   731 # Include the custom makefile right here, after all variables have been defined
       
   732 # so that they may be overridden, but before the main targets are declared, so 
       
   733 # that overriding has an effect.
       
   734 $(eval $(call IncludeCustomExtension, jdk, Images.gmk))
       
   735 
       
   736 ################################################################################
   734 # Main targets
   737 # Main targets
   735 
   738 
   736 jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
   739 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 \
   740     $(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) \
   741     $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \
   777 endif # Profile
   780 endif # Profile
   778 
   781 
   779 ################################################################################
   782 ################################################################################
   780 
   783 
   781 .PHONY: default images jre-image jdk-image
   784 .PHONY: default images jre-image jdk-image
   782 
       
   783 # Hook to include the corresponding custom file, if present.
       
   784 $(eval $(call IncludeCustomExtension, jdk, Images.gmk))