RFR: JDK-8172312 Update docs target and image for new combined docs

Erik Joelsson erik.joelsson at oracle.com
Thu Mar 30 13:42:46 UTC 2017


Javadoc.gmk:159 looks like too much indentation

The variable JAVADOC_SOURCE_DIRS is starting to seem a bit redundant. It 
does contain two directories that would not be included if you replaced 
$(call PathList, $(JAVADOC_SOURCE_DIRS)) with $(call GetModuleSrcPath), 
but that could be rectified by adding $(SUPPORT_OUTPUTDIR)/rmic to 
GENERATED_SRC_DIRS and share/doc/stub to SRC_SUBDIRS in Javadoc.gmk. 
Doing so would make the dependency calculation and the actual source dir 
input be based on the same definitions.


On 2017-03-30 15:05, Magnus Ihse Bursie wrote:
> As a part of JEP 299, we should build the Javadoc as a single combined 
> output, instead of a dozen or so individual javadoc bundles. This bug 
> fixes this. The selection on what to include is now based on modules 
> instead of packages.
> The fix in MakeBase.gmk is to keep CacheFind quiet if the src dir(s) 
> does not exist, otherwise find can emit an error message. (This was 
> provoked by the new call to SetupZipArchive).
> The module selection has been contributed by Mandy Chang.
> I intend to push this to JDK9. Since this is a noreg-doc bug, no 
> special RDP2 process is required.
> Bug: https://bugs.openjdk.java.net/browse/JDK-8172312
> WebRev: 
> http://cr.openjdk.java.net/~ihse/JDK-8172312-combined-javadocs/webrev.01
> /Magnus

More information about the build-dev mailing list