From 627e6c6bfa96130df05bed64e6f77d89a672f8dc Mon Sep 17 00:00:00 2001 From: Robert Field Date: Wed, 6 Jul 2016 20:56:27 -0700 Subject: [PATCH] 8160009: JShell: Add SPI and execution to generated JShell javadoc (root ws) Reviewed-by: jlahoda --- make/Javadoc.gmk | 5 ++--- make/common/NON_CORE_PKGS.gmk | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index 4d946139940..00ec8ef62b3 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -1223,8 +1223,7 @@ JSHELLAPI_DOCTITLE := JShell API JSHELLAPI_WINDOWTITLE := JShell API JSHELLAPI_HEADER := JSHELL API JSHELLAPI_BOTTOM := $(call CommonBottom,$(JSHELLAPI_FIRST_COPYRIGHT_YEAR)) -JSHELLAPI_GROUPNAME := Packages -JSHELLAPI_REGEXP := jdk.jshell.* +JSHELLAPI_OVERVIEW := $(LANGTOOLS_TOPDIR)/src/jdk.jshell/share/classes/jdk/jshell/overview.html # JSHELLAPI_PKGS is located in NON_CORE_PKGS.gmk JSHELLAPI_INDEX_HTML = $(JSHELLAPI_DOCDIR)/index.html @@ -1256,11 +1255,11 @@ $(JSHELLAPI_OPTIONS_FILE): $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \ $(call OptionPair,-addmods,$(JSHELLAPI_MODULES)) ; \ $(call OptionPair,-encoding,ascii) ; \ + $(call OptionPair,-overview,$(JSHELLAPI_OVERVIEW)) ; \ $(call OptionPair,-doctitle,$(JSHELLAPI_DOCTITLE)) ; \ $(call OptionPair,-windowtitle,$(JSHELLAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ $(call OptionPair,-header,$(JSHELLAPI_HEADER)$(DRAFT_HEADER)) ; \ $(call OptionPair,-bottom,$(JSHELLAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ - $(call OptionTrip,-group,$(JSHELLAPI_GROUPNAME),$(JSHELLAPI_REGEXP)); \ $(call OptionTrip,-linkoffline,$(JSHELLAPI2COREAPI),$(COREAPI_DOCSDIR)/); \ ) >> $@ diff --git a/make/common/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk index b6ef5a9d450..ad546a4456d 100644 --- a/make/common/NON_CORE_PKGS.gmk +++ b/make/common/NON_CORE_PKGS.gmk @@ -81,7 +81,9 @@ ATTACH_PKGS = com.sun.tools.attach \ JCONSOLE_PKGS = com.sun.tools.jconsole -JSHELLAPI_PKGS = jdk.jshell +JSHELLAPI_PKGS = jdk.jshell \ + jdk.jshell.spi \ + jdk.jshell.execution TREEAPI_PKGS = com.sun.source.doctree \ com.sun.source.tree \