equal
deleted
inserted
replaced
361 release-file exploded-image-optimize |
361 release-file exploded-image-optimize |
362 |
362 |
363 ################################################################################ |
363 ################################################################################ |
364 # Docs targets |
364 # Docs targets |
365 |
365 |
|
366 docs-module-graphs: |
|
367 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-module-graphs) |
|
368 |
366 docs-javadoc: |
369 docs-javadoc: |
367 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javadoc) |
370 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javadoc) |
368 |
371 |
369 docs-copy: |
372 docs-copy: |
370 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy) |
373 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy) |
373 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip) |
376 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip) |
374 |
377 |
375 update-build-docs: |
378 update-build-docs: |
376 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) |
379 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) |
377 |
380 |
378 ALL_TARGETS += docs-javadoc docs-copy docs-zip update-build-docs |
381 ALL_TARGETS += docs-module-graphs docs-javadoc docs-copy docs-zip update-build-docs |
379 |
382 |
380 ################################################################################ |
383 ################################################################################ |
381 # Cross compilation support |
384 # Cross compilation support |
382 |
385 |
383 ifeq ($(CREATING_BUILDJDK), true) |
386 ifeq ($(CREATING_BUILDJDK), true) |
770 exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \ |
773 exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \ |
771 buildtools-modules |
774 buildtools-modules |
772 |
775 |
773 bootcycle-images: jdk-image |
776 bootcycle-images: jdk-image |
774 |
777 |
|
778 docs-module-graphs: exploded-image buildtools-modules |
|
779 |
775 docs-javadoc: $(GENSRC_TARGETS) rmic |
780 docs-javadoc: $(GENSRC_TARGETS) rmic |
776 |
781 |
777 # The gensrc step for jdk.jdi creates an html file that is used by docs-copy. |
782 # The gensrc step for jdk.jdi creates an html file that is used by docs-copy. |
778 docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc |
783 docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc |
779 |
784 |
927 ifeq ($(OPENJDK_TARGET_OS), macosx) |
932 ifeq ($(OPENJDK_TARGET_OS), macosx) |
928 product-images: mac-bundles |
933 product-images: mac-bundles |
929 endif |
934 endif |
930 |
935 |
931 # This target builds the documentation image |
936 # This target builds the documentation image |
932 docs-image: docs-javadoc docs-copy |
937 docs-image: docs-module-graphs docs-javadoc docs-copy |
933 |
938 |
934 # This target builds the test image |
939 # This target builds the test image |
935 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
940 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
936 test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest |
941 test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest |
937 |
942 |