[11] RFR JDK-8197865: @moduleGraph taglet generates incorrect link to module graph

Lance Andersen lance.andersen at oracle.com
Tue Feb 13 19:38:58 UTC 2018


Hi Mandy

I just submitted an RFR to build-dev  so our emails crossed

> On Feb 13, 2018, at 2:29 PM, mandy chung <mandy.chung at oracle.com> wrote:
> 
> Jon, Kumar,
> 
> This is a regression from JDK-8195795 that generates 
> <a href=" ${MODULE}/module-graph.png"> but module-summary.html 
> is under ${MODULE} directory. The correct link should be 
> a href="module-graph.png">... </a> 
> 
> Lance - I include make/Docs.gmk fix here since the docs hangs.
> Are you going to push a fix for it?  If not, I can create
> a separate issue and fix it.
> 
> diff --git a/make/Docs.gmk b/make/Docs.gmk
> --- a/make/Docs.gmk
> +++ b/make/Docs.gmk
> @@ -445,9 +445,9 @@
>  ################################################################################
>  # Setup generation of the Java SE API documentation (javadoc + modulegraph)
>  
> -# The Java SE module scope is just java.se.ee and its transitive indirect
> +# The Java SE module scope is just java.se and its transitive indirect
>  # exports.
> -JAVASE_MODULES := java.se.ee
> +JAVASE_MODULES := java.se
>  
>  $(eval $(call SetupApiDocsGeneration, JAVASE_API, \
>      MODULES := $(JAVASE_MODULES), \
> diff --git a/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java
> --- a/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java
> +++ b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java
> @@ -64,7 +64,7 @@
>          }
>  
>          String moduleName = ((ModuleElement) element).getQualifiedName().toString();
> -        String imageFile = moduleName + "/module-graph.png";
> +        String imageFile = "module-graph.png";
>          int thumbnailHeight = -1;
>          String hoverImage = "";
>          if (!moduleName.equals("java.base")) {

 <http://oracle.com/us/design/oracle-email-sig-198324.gif>
 <http://oracle.com/us/design/oracle-email-sig-198324.gif> <http://oracle.com/us/design/oracle-email-sig-198324.gif>
 <http://oracle.com/us/design/oracle-email-sig-198324.gif>Lance Andersen| Principal Member of Technical Staff | +1.781.442.2037
Oracle Java Engineering 
1 Network Drive 
Burlington, MA 01803
Lance.Andersen at oracle.com <mailto:Lance.Andersen at oracle.com>






More information about the build-dev mailing list