equal
deleted
inserted
replaced
372 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-javadoc) |
372 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-javadoc) |
373 |
373 |
374 docs-javase-api-modulegraph: |
374 docs-javase-api-modulegraph: |
375 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-modulegraph) |
375 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-javase-api-modulegraph) |
376 |
376 |
377 docs-copy: |
377 docs-jdk-specs: |
378 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-copy) |
378 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-jdk-specs) |
379 |
379 |
380 docs-zip: |
380 docs-zip: |
381 +($(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) |
382 |
382 |
383 update-build-docs: |
383 update-build-docs: |
384 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) |
384 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) |
385 |
385 |
386 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \ |
386 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \ |
387 docs-javase-api-javadoc docs-javase-api-modulegraph docs-copy docs-zip \ |
387 docs-javase-api-javadoc docs-javase-api-modulegraph docs-jdk-specs \ |
388 update-build-docs |
388 docs-zip update-build-docs |
389 |
389 |
390 ################################################################################ |
390 ################################################################################ |
391 # Cross compilation support |
391 # Cross compilation support |
392 |
392 |
393 ifeq ($(CREATING_BUILDJDK), true) |
393 ifeq ($(CREATING_BUILDJDK), true) |
788 |
788 |
789 docs-jdk-api-modulegraph: exploded-image buildtools-modules |
789 docs-jdk-api-modulegraph: exploded-image buildtools-modules |
790 |
790 |
791 docs-javase-api-modulegraph: exploded-image buildtools-modules |
791 docs-javase-api-modulegraph: exploded-image buildtools-modules |
792 |
792 |
793 # The gensrc step for jdk.jdi creates an html file that is used by docs-copy. |
793 # The gensrc steps for hotspot and jdk.jdi create html spec files. |
794 docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc |
794 docs-jdk-specs: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc |
795 |
795 |
796 docs-zip: docs-jdk docs-copy |
796 docs-zip: docs-jdk |
797 |
797 |
798 test: jdk-image test-image |
798 test: jdk-image test-image |
799 |
799 |
800 run-test: jdk-image test-image |
800 run-test: jdk-image test-image |
801 |
801 |
920 ifeq ($(ENABLE_FULL_DOCS), true) |
920 ifeq ($(ENABLE_FULL_DOCS), true) |
921 docs-jdk-api: docs-jdk-api-modulegraph |
921 docs-jdk-api: docs-jdk-api-modulegraph |
922 docs-javase-api: docs-javase-api-modulegraph |
922 docs-javase-api: docs-javase-api-modulegraph |
923 endif |
923 endif |
924 |
924 |
925 docs-jdk: docs-jdk-api |
925 docs-jdk: docs-jdk-api docs-jdk-specs |
926 docs-javase: docs-javase-api |
926 docs-javase: docs-javase-api |
927 |
927 |
928 # alias for backwards compatibility |
928 # alias for backwards compatibility |
929 docs-javadoc: docs-jdk-api |
929 docs-javadoc: docs-jdk-api |
930 |
930 |
957 ifeq ($(OPENJDK_TARGET_OS), macosx) |
957 ifeq ($(OPENJDK_TARGET_OS), macosx) |
958 product-images: mac-bundles |
958 product-images: mac-bundles |
959 endif |
959 endif |
960 |
960 |
961 # This target builds the documentation image |
961 # This target builds the documentation image |
962 docs-image: docs-jdk docs-copy |
962 docs-image: docs-jdk |
963 |
963 |
964 # This target builds the test image |
964 # This target builds the test image |
965 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
965 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
966 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 |
967 |
967 |