make/Main.gmk
changeset 44726 04aa2c065f5c
parent 44725 8747b14eb49c
child 44733 6505f00be6f2
equal deleted inserted replaced
44725:8747b14eb49c 44726:04aa2c065f5c
   358     release-file exploded-image-optimize
   358     release-file exploded-image-optimize
   359 
   359 
   360 ################################################################################
   360 ################################################################################
   361 # Docs targets
   361 # Docs targets
   362 
   362 
   363 docs-module-graphs:
   363 # If building full docs, to complete docs-*-api we need both the javadoc and
   364 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-module-graphs)
   364 # modulegraph targets.
   365 
   365 docs-jdk-api-javadoc:
   366 docs-javadoc:
   366 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-jdk-api-javadoc)
   367 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javadoc)
   367 
   368 
   368 docs-jdk-api-modulegraph:
   369 docs-reference:
   369 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-jdk-api-modulegraph)
   370 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-reference)
   370 
       
   371 docs-javase-api-javadoc:
       
   372 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-javadoc)
       
   373 
       
   374 docs-javase-api-modulegraph:
       
   375 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-modulegraph)
   371 
   376 
   372 docs-copy:
   377 docs-copy:
   373 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy)
   378 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy)
   374 
   379 
   375 docs-zip:
   380 docs-zip:
   376 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
   381 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
   377 
   382 
   378 update-build-docs:
   383 update-build-docs:
   379 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
   384 	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
   380 
   385 
   381 ALL_TARGETS += docs-module-graphs docs-javadoc docs-reference docs-copy \
   386 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \
   382     docs-zip update-build-docs
   387     docs-javase-api-javadoc docs-javase-api-modulegraph docs-copy docs-zip \
       
   388     update-build-docs
   383 
   389 
   384 ################################################################################
   390 ################################################################################
   385 # Cross compilation support
   391 # Cross compilation support
   386 
   392 
   387 ifeq ($(CREATING_BUILDJDK), true)
   393 ifeq ($(CREATING_BUILDJDK), true)
   774   exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \
   780   exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \
   775       buildtools-modules
   781       buildtools-modules
   776 
   782 
   777   bootcycle-images: jdk-image
   783   bootcycle-images: jdk-image
   778 
   784 
   779   docs-module-graphs: exploded-image buildtools-modules
   785   docs-jdk-api-javadoc: $(GENSRC_TARGETS) rmic
   780 
   786 
   781   docs-javadoc: $(GENSRC_TARGETS) rmic
   787   docs-javase-api-javadoc: $(GENSRC_TARGETS) rmic
   782 
   788 
   783   docs-reference: $(GENSRC_TARGETS) rmic
   789   docs-jdk-api-modulegraph: exploded-image buildtools-modules
       
   790 
       
   791   docs-javase-api-modulegraph: exploded-image buildtools-modules
   784 
   792 
   785   # The gensrc step for jdk.jdi creates an html file that is used by docs-copy.
   793   # The gensrc step for jdk.jdi creates an html file that is used by docs-copy.
   786   docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc
   794   docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc
   787 
   795 
   788   docs-zip: docs-javadoc docs-copy
   796   docs-zip: docs-jdk docs-copy
   789 
   797 
   790   test: jdk-image test-image
   798   test: jdk-image test-image
   791 
   799 
   792   run-test: jdk-image test-image
   800   run-test: jdk-image test-image
   793 
   801 
   902   exploded-image: exploded-image-optimize
   910   exploded-image: exploded-image-optimize
   903 endif
   911 endif
   904 
   912 
   905 create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
   913 create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
   906 
   914 
       
   915 docs-jdk-api: docs-jdk-api-javadoc
       
   916 docs-javase-api: docs-javase-api-javadoc
       
   917 
       
   918 # If we're building full docs, we must also generate the module graphs to
       
   919 # get non-broken api documentation.
       
   920 ifeq ($(ENABLE_FULL_DOCS), true)
       
   921   docs-jdk-api: docs-jdk-api-modulegraph
       
   922   docs-javase-api: docs-javase-api-modulegraph
       
   923 endif
       
   924 
       
   925 docs-jdk: docs-jdk-api
       
   926 docs-javase: docs-javase-api
       
   927 
       
   928 # alias for backwards compatibility
       
   929 docs-javadoc: docs-jdk-api
       
   930 
   907 mac-bundles: mac-bundles-jdk
   931 mac-bundles: mac-bundles-jdk
   908 
   932 
   909 # The $(BUILD_OUTPUT)/images directory contain the resulting deliverables,
   933 # The $(BUILD_OUTPUT)/images directory contain the resulting deliverables,
   910 # and in line with this, our targets for creating these are named *-image[s].
   934 # and in line with this, our targets for creating these are named *-image[s].
   911 
   935 
   933 ifeq ($(OPENJDK_TARGET_OS), macosx)
   957 ifeq ($(OPENJDK_TARGET_OS), macosx)
   934   product-images: mac-bundles
   958   product-images: mac-bundles
   935 endif
   959 endif
   936 
   960 
   937 # This target builds the documentation image
   961 # This target builds the documentation image
   938 docs-image: docs-module-graphs docs-javadoc docs-copy
   962 docs-image: docs-jdk docs-copy
   939 
   963 
   940 # This target builds the test image
   964 # This target builds the test image
   941 test-image: prepare-test-image test-image-hotspot-jtreg-native \
   965 test-image: prepare-test-image test-image-hotspot-jtreg-native \
   942     test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest
   966     test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest
   943 
   967 
   949 
   973 
   950 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
   974 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
   951     copy java rmic libs launchers jmods \
   975     copy java rmic libs launchers jmods \
   952     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
   976     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
   953     exploded-image-base exploded-image \
   977     exploded-image-base exploded-image \
   954     create-buildjdk mac-bundles product-images \
   978     create-buildjdk docs-jdk-api docs-javase-api docs-jdk docs-javase \
       
   979     docs-javadoc mac-bundles product-images \
   955     profiles profiles-images \
   980     profiles profiles-images \
   956     docs-image test-image all-images \
   981     docs-image test-image all-images \
   957     all-bundles
   982     all-bundles
   958 
   983 
   959 ################################################################################
   984 ################################################################################