make/Main.gmk
changeset 41652 a0664e2b49a1
parent 41461 53935ea8789d
child 41660 e997167fd947
equal deleted inserted replaced
41651:38f26302650f 41652:a0664e2b49a1
   339 
   339 
   340 ################################################################################
   340 ################################################################################
   341 # Docs targets
   341 # Docs targets
   342 
   342 
   343 docs-javadoc:
   343 docs-javadoc:
   344 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
   344 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javadoc)
   345 
   345 
   346 docs-jvmtidoc:
   346 docs-copy:
   347 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs)
   347 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy)
   348 
   348 
   349 zip-docs:
   349 docs-zip:
   350 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs)
   350 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
   351 
   351 
   352 ALL_TARGETS += docs-javadoc docs-jvmtidoc zip-docs
   352 ALL_TARGETS += docs-javadoc docs-copy docs-zip
   353 
   353 
   354 ################################################################################
   354 ################################################################################
   355 # Cross compilation support
   355 # Cross compilation support
   356 
   356 
   357 ifeq ($(CREATING_BUILDJDK), true)
   357 ifeq ($(CREATING_BUILDJDK), true)
   681 
   681 
   682   bootcycle-images: jdk-image
   682   bootcycle-images: jdk-image
   683 
   683 
   684   docs-javadoc: $(GENSRC_TARGETS) rmic
   684   docs-javadoc: $(GENSRC_TARGETS) rmic
   685 
   685 
   686   docs-jvmtidoc: hotspot
   686   docs-copy: hotspot
   687 
   687 
   688   zip-docs: docs-javadoc docs-jvmtidoc
   688   docs-zip: docs-javadoc docs-copy
   689 
   689 
   690   test: jdk-image test-image
   690   test: jdk-image test-image
   691 
   691 
   692   create-buildjdk-copy: jdk.jlink-java java.base-gendata \
   692   create-buildjdk-copy: jdk.jlink-java java.base-gendata \
   693       $(addsuffix -java, $(INTERIM_IMAGE_MODULES))
   693       $(addsuffix -java, $(INTERIM_IMAGE_MODULES))
   810 ifeq ($(OPENJDK_TARGET_OS), macosx)
   810 ifeq ($(OPENJDK_TARGET_OS), macosx)
   811   product-images: mac-bundles
   811   product-images: mac-bundles
   812 endif
   812 endif
   813 
   813 
   814 # This target builds the documentation image
   814 # This target builds the documentation image
   815 docs-image: docs-javadoc docs-jvmtidoc
   815 docs-image: docs-javadoc docs-copy
   816 
   816 
   817 # This target builds the test image
   817 # This target builds the test image
   818 test-image: prepare-test-image test-image-hotspot-jtreg-native \
   818 test-image: prepare-test-image test-image-hotspot-jtreg-native \
   819     test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest
   819     test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest
   820 
   820 
   858 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
   858 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
   859 CLEAN_SUPPORT_DIRS += demos
   859 CLEAN_SUPPORT_DIRS += demos
   860 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
   860 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
   861 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
   861 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
   862 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
   862 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
   863 CLEAN_PHASES := gensrc java native include docs
   863 CLEAN_PHASES := gensrc java native include
   864 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
   864 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
   865 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
   865 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
   866 # Construct targets of the form clean-$module-$phase
   866 # Construct targets of the form clean-$module-$phase
   867 CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \
   867 CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \
   868     $(addprefix $m-, $(CLEAN_PHASES))))
   868     $(addprefix $m-, $(CLEAN_PHASES))))
   869 
   869 
   870 # Remove everything, except the output from configure.
   870 # Remove everything, except the output from configure.
   871 clean: $(CLEAN_DIR_TARGETS)
   871 clean: $(CLEAN_DIR_TARGETS)
   872 	($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*)
   872 	($(CD) $(OUTPUT_ROOT) && $(RM) -r build*.log*)
   873 	$(ECHO) Cleaned all build artifacts.
   873 	$(ECHO) Cleaned all build artifacts.
       
   874 
       
   875 clean-docs:
       
   876 	$(call CleanDocs)
   874 
   877 
   875 $(CLEAN_DIR_TARGETS):
   878 $(CLEAN_DIR_TARGETS):
   876 	$(call CleanDir,$(patsubst clean-%, %, $@))
   879 	$(call CleanDir,$(patsubst clean-%, %, $@))
   877 
   880 
   878 $(CLEAN_SUPPORT_DIR_TARGETS):
   881 $(CLEAN_SUPPORT_DIR_TARGETS):
   909 	        && $(RM) -r $(OUTPUT_ROOT)) \
   912 	        && $(RM) -r $(OUTPUT_ROOT)) \
   910 	  fi \
   913 	  fi \
   911 	)
   914 	)
   912 	$(ECHO) Cleaned everything, you will have to re-run configure.
   915 	$(ECHO) Cleaned everything, you will have to re-run configure.
   913 
   916 
   914 ALL_TARGETS += clean dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \
   917 ALL_TARGETS += clean clean-docs dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \
   915     $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \
   918     $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \
   916     $(CLEAN_MODULE_PHASE_TARGETS)
   919     $(CLEAN_MODULE_PHASE_TARGETS)
   917 
   920 
   918 ################################################################################
   921 ################################################################################
   919 # Declare *-only targets for each normal target
   922 # Declare *-only targets for each normal target