equal
deleted
inserted
replaced
397 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip) |
397 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip) |
398 |
398 |
399 update-build-docs: |
399 update-build-docs: |
400 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) |
400 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk) |
401 |
401 |
|
402 update-x11wrappers: |
|
403 +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateX11Wrappers.gmk) |
|
404 |
402 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \ |
405 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \ |
403 docs-javase-api-javadoc docs-javase-api-modulegraph \ |
406 docs-javase-api-javadoc docs-javase-api-modulegraph \ |
404 docs-reference-api-javadoc docs-reference-api-modulegraph docs-jdk-specs \ |
407 docs-reference-api-javadoc docs-reference-api-modulegraph docs-jdk-specs \ |
405 docs-jdk-index docs-zip update-build-docs |
408 docs-jdk-index docs-zip update-build-docs update-x11wrappers |
406 |
409 |
407 ################################################################################ |
410 ################################################################################ |
408 # Cross compilation support |
411 # Cross compilation support |
409 |
412 |
410 ifeq ($(CREATING_BUILDJDK), true) |
413 ifeq ($(CREATING_BUILDJDK), true) |
722 java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS)) |
725 java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS)) |
723 endif |
726 endif |
724 |
727 |
725 # If not already set, set the JVM target so that the JVM will be built. |
728 # If not already set, set the JVM target so that the JVM will be built. |
726 JVM_MAIN_TARGETS ?= hotspot |
729 JVM_MAIN_TARGETS ?= hotspot |
727 |
730 |
728 # Building java.base-jmod requires all of VM (ie hotspot) to be built. |
731 # Building java.base-jmod requires all of VM (ie hotspot) to be built. |
729 java.base-jmod: $(JVM_MAIN_TARGETS) |
732 java.base-jmod: $(JVM_MAIN_TARGETS) |
730 |
733 |
731 # Declare dependencies from <module>-jmod to all other module targets |
734 # Declare dependencies from <module>-jmod to all other module targets |
732 # When creating a BUILDJDK, the java compilation has already been done by the |
735 # When creating a BUILDJDK, the java compilation has already been done by the |
733 # normal build and copied in. |
736 # normal build and copied in. |
734 ifneq ($(CREATING_BUILDJDK), true) |
737 ifneq ($(CREATING_BUILDJDK), true) |
828 |
831 |
829 docs-reference-api-modulegraph: exploded-image buildtools-modules |
832 docs-reference-api-modulegraph: exploded-image buildtools-modules |
830 |
833 |
831 # If not already set, then set the JVM specific docs targets |
834 # If not already set, then set the JVM specific docs targets |
832 JVM_DOCS_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc |
835 JVM_DOCS_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc |
833 |
836 |
834 # The gensrc steps for hotspot and jdk.jdi create html spec files. |
837 # The gensrc steps for hotspot and jdk.jdi create html spec files. |
835 docs-jdk-specs: $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \ |
838 docs-jdk-specs: $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \ |
836 docs-jdk-index |
839 docs-jdk-index |
837 |
840 |
838 docs-jdk-index: exploded-image buildtools-modules |
841 docs-jdk-index: exploded-image buildtools-modules |
891 test-bundles: test-image |
894 test-bundles: test-image |
892 |
895 |
893 docs-bundles: docs-image |
896 docs-bundles: docs-image |
894 |
897 |
895 generate-summary: jmods buildtools-modules |
898 generate-summary: jmods buildtools-modules |
|
899 |
|
900 update-x11wrappers: java.base-copy buildtools-jdk |
896 |
901 |
897 endif |
902 endif |
898 |
903 |
899 ################################################################################ |
904 ################################################################################ |
900 # Virtual targets without recipes |
905 # Virtual targets without recipes |