make/Javadoc.gmk

*** 25,34 ****
--- 25,35 ----
  default: all
  
  include $(SPEC)
  include MakeBase.gmk
  include $(JDK_TOPDIR)/make/Tools.gmk
+ include $(JDK_TOPDIR)/make/ModuleTools.gmk
  
  ################################################################################
  
  # List of all possible directories for javadoc to look for sources
  # Allow custom to overwrite.
*** 172,181 ****
--- 173,183 ----
      -tag 'implSpec:a:Implementation Requirements:' \
      -tag 'implNote:a:Implementation Note:' \
      -tag param \
      -tag return \
      -tag throws \
+     -taglet build.tools.taglet.ModuleGraph \
      -tag since \
      -tag version \
      -tag serialData \
      -tag factory \
      -tag see \
*** 186,195 ****
--- 188,204 ----
      #
  
  DEFAULT_JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
      -serialwarn -encoding ISO-8859-1 -breakiterator --system none
  
+ #
+ # TODO: this should be set by the configure option.
+ #
+ ifndef ENABLE_MODULE_GRAPH
+    ENABLE_MODULE_GRAPH=false
+ endif
+ 
  ################################################################################
  # Setup make rules for running javadoc.
  #
  # Parameter 1 is the name of the rule. This name is used as variable prefix,
  # and the targets generated are listed in a variable by that name. Note that
*** 319,329 ****
          $$(call MakeDir, $$(@D))
          ifneq ($$($1_PACKAGES_FILE), )
            $$(eval $$(call ListPathsSafely, $1_PACKAGES, $$($1_PACKAGES_FILE)))
          endif
          $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/docs/$1.javadoc, \
!             $$($1_JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -d $$(@D) \
                  $$(DEFAULT_JAVADOC_TAGS) $$(DEFAULT_JAVADOC_OPTIONS) \
                  --module-source-path $$(call PathList, $$(JAVADOC_SOURCE_DIRS)) \
                  $$($1_OPTIONS) $$($1_PACKAGES_ARG))
  
    # The output returned will be the index.html file
--- 328,339 ----
          $$(call MakeDir, $$(@D))
          ifneq ($$($1_PACKAGES_FILE), )
            $$(eval $$(call ListPathsSafely, $1_PACKAGES, $$($1_PACKAGES_FILE)))
          endif
          $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/docs/$1.javadoc, \
!             $$($1_JAVA) -Djava.awt.headless=true -DenableModuleGraph=$(ENABLE_MODULE_GRAPH) \
!                 $(NEW_JAVADOC) -d $$(@D) \
                  $$(DEFAULT_JAVADOC_TAGS) $$(DEFAULT_JAVADOC_OPTIONS) \
                  --module-source-path $$(call PathList, $$(JAVADOC_SOURCE_DIRS)) \
                  $$($1_OPTIONS) $$($1_PACKAGES_ARG))
  
    # The output returned will be the index.html file
*** 733,752 ****
          popd ;
  
  ZIP_TARGETS += $(JAVADOC_ARCHIVE)
  
  ################################################################################
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, , Javadoc.gmk))
  
  ################################################################################
  
  docs-javadoc: $(TARGETS)
  
  docs-copy: $(COPY_TARGETS)
  
  docs-zip: $(ZIP_TARGETS)
  
! all: docs-javadoc docs-copy docs-zip
  
! .PHONY: default all docs-javadoc docs-copy docs-zip
--- 743,778 ----
          popd ;
  
  ZIP_TARGETS += $(JAVADOC_ARCHIVE)
  
  ################################################################################
+ # generate .dot files for module graphs
+ 
+ JAVADOC_MODULE_GRAPHS_DIR := $(SUPPORT_OUTPUTDIR)/docs/module-graphs
+ JAVADOC_MODULE_GRAPHS := $(JAVADOC_MODULE_GRAPHS_DIR)/java.se.dot
+ JAVADOC_MODULE_GRAPHS_ATTRIBUTES := $(JDK_TOPDIR)/make/src/classes/build/tools/jigsaw/javadoc-graphs.properties
+ 
+ $(JAVADOC_MODULE_GRAPHS): $(BUILD_JIGSAW_TOOLS) $(JAVADOC_MODULE_GRAPHS_ATTRIBUTES)
+         $(MKDIR) -p $(@D)
+         $(TOOL_GENGRAPHS) --spec --output $(JAVADOC_MODULE_GRAPHS_DIR) \
+             --dot-attributes $(JAVADOC_MODULE_GRAPHS_ATTRIBUTES)
+ 
+ MODULE_GRAPH_TARGETS += $(JAVADOC_MODULE_GRAPHS)
+ 
+ ################################################################################
  
  # Hook to include the corresponding custom file, if present.
  $(eval $(call IncludeCustomExtension, , Javadoc.gmk))
  
  ################################################################################
  
+ docs-module-graphs: $(MODULE_GRAPH_TARGETS) 
+ 
  docs-javadoc: $(TARGETS)
  
  docs-copy: $(COPY_TARGETS)
  
  docs-zip: $(ZIP_TARGETS)
  
! all: docs-module-graphs docs-javadoc docs-copy docs-zip
  
! .PHONY: default all docs-module-graphs docs-javadoc docs-copy docs-zip