make/Images.gmk
changeset 35238 b6d8d17606be
parent 35008 ef0cd710989f
child 36171 7fe73c768138
equal deleted inserted replaced
35237:9bd7d91ca664 35238:b6d8d17606be
   246     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
   246     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
   247     MAN1_SUBDIR = man
   247     MAN1_SUBDIR = man
   248   endif
   248   endif
   249 
   249 
   250   $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
   250   $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
   251 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   251 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   252 	$(install-file)
   252 	$(install-file)
   253 
   253 
   254   $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
   254   $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
   255 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   255 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   256 	$(install-file)
   256 	$(install-file)
   257 
   257 
   258   $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   258   $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   259 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   259 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   260 	$(install-file)
   260 	$(install-file)
   261 
   261 
   262   $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   262   $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   263 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   263 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   264 	$(install-file)
   264 	$(install-file)
   265 
   265 
   266   ifeq ($(OPENJDK_TARGET_OS), solaris)
   266   ifeq ($(OPENJDK_TARGET_OS), solaris)
   267     $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   267     $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   268 	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   268 	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   269 	$(install-file)
   269 	$(install-file)
   270 
   270 
   271     $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   271     $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
   272 	$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   272 	$(call LogInfo, Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   273 	$(install-file)
   273 	$(install-file)
   274   endif
   274   endif
   275 
   275 
   276   ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
   276   ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
   277     $(JRE_IMAGE_DIR)/man/ja:
   277     $(JRE_IMAGE_DIR)/man/ja:
   278 	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   278 	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   279 	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
   279 	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
   280 
   280 
   281     $(JDK_IMAGE_DIR)/man/ja:
   281     $(JDK_IMAGE_DIR)/man/ja:
   282 	$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   282 	$(call LogInfo, Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   283 	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
   283 	$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
   284   endif
   284   endif
   285 
   285 
   286   ifeq ($(OPENJDK_TARGET_OS), solaris)
   286   ifeq ($(OPENJDK_TARGET_OS), solaris)
   287     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   287     JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
   331 JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
   331 JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
   332 
   332 
   333 # Processing license files from source area to image area
   333 # Processing license files from source area to image area
   334 # These are modified to have the platform specific EOL chars.
   334 # These are modified to have the platform specific EOL chars.
   335 define process-doc-file
   335 define process-doc-file
   336 	$(ECHO) $(LOG_INFO) Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   336 	$(call LogInfo, Processing $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   337 	$(MKDIR) -p $(@D)
   337 	$(MKDIR) -p $(@D)
   338 	$(RM) $@
   338 	$(RM) $@
   339 	LC_ALL=C $(SED) 's/$$//g' $< > $@
   339 	LC_ALL=C $(SED) 's/$$//g' $< > $@
   340 	$(CHMOD) 444 $@
   340 	$(CHMOD) 444 $@
   341 endef
   341 endef
   376   $(call info-file-item, "MODULES", "`$(CAT) $1`")
   376   $(call info-file-item, "MODULES", "`$(CAT) $1`")
   377 endef
   377 endef
   378 
   378 
   379 # Param 1 - The file containing the MODULES list
   379 # Param 1 - The file containing the MODULES list
   380 define prepare-info-file
   380 define prepare-info-file
   381   $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   381   $(call LogInfo, Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   382   $(MKDIR) -p $(@D)
   382   $(MKDIR) -p $(@D)
   383   $(RM) $@
   383   $(RM) $@
   384 endef
   384 endef
   385 
   385 
   386 define info-file
   386 define info-file
   424 
   424 
   425 ################################################################################
   425 ################################################################################
   426 # src.zip
   426 # src.zip
   427 
   427 
   428 $(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
   428 $(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
   429 	$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
   429 	$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
   430 	$(install-file)
   430 	$(install-file)
   431 
   431 
   432 JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
   432 JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip
   433 
   433 
   434 ################################################################################
   434 ################################################################################
   435 # /demo dir
   435 # /demo dir
   436 
       
   437 # The db demo contains an empty dir that needs to be copied. The other
       
   438 # directories will always trigger the rule for recompile since
       
   439 # _the.list_of_packages files are touched.
       
   440 ifneq ($(findstring images, $(MAKECMDGOALS)), )
   436 ifneq ($(findstring images, $(MAKECMDGOALS)), )
   441   $(JDK_IMAGE_DIR)/demo/%: $(SUPPORT_OUTPUTDIR)/demos/image/%
   437   $(eval $(call SetupCopyFiles, JDK_COPY_DEMOS, \
   442 	if [ ! -d "$@" ]; then \
   438       SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
   443 	  $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
   439       DEST := $(JDK_IMAGE_DIR)/demo, \
   444 	  $(MKDIR) -p $(@D); \
   440       FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
   445 	  if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
   441           $(call DoubleDollar, $(call DoubleDollar, \
   446 	fi
   442           $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
   447 
   443           -type f -a ! \( -name "_the*" -o -name "javac_state" \) )))), \
   448   # Find all files including directories
   444   ))
   449   JDK_DEMO_TARGETS := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/demos/image), \
   445 
   450       $(patsubst $(SUPPORT_OUTPUTDIR)/demos/image/%, $(JDK_IMAGE_DIR)/demo/%, \
   446   JDK_TARGETS += $(JDK_COPY_DEMOS)
   451       $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/demos/image \
       
   452           ! \( -name "_the*" -o -name "javac_state" \) )))
       
   453 
       
   454   JDK_TARGETS += $(JDK_DEMO_TARGETS)
       
   455 endif
   447 endif
   456 
   448 
   457 ################################################################################
   449 ################################################################################
   458 # /sample dir
   450 # /sample dir
   459 
   451 
   460 $(eval $(call SetupCopyFiles,COPY_SAMPLES, \
   452 $(eval $(call SetupCopyFiles, COPY_SAMPLES, \
   461     SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
   453     SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
   462     DEST := $(JDK_IMAGE_DIR)/sample, \
   454     DEST := $(JDK_IMAGE_DIR)/sample, \
   463     FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
   455     FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
   464         $(call CacheFind,$(SUPPORT_OUTPUTDIR)/sample/image))))
   456         $(call CacheFind,$(SUPPORT_OUTPUTDIR)/sample/image))))
   465 
   457