Looks good to me.
My suggestion was to to add the rmic dirs to those variables in
Javadoc.gmk, but your solution is even better. I didn't realize that you
could just add to a "pathlist" with another call to PathList, so I
thought we had to get at the variables that GetModuleSrcPath uses as
input. Anyway, very nice to not have to duplicate the list of source
dirs anymore.
/Erik
On 2017-03-30 22:17, Magnus Ihse Bursie wrote:
On 2017-03-30 21:19, Magnus Ihse Bursie wrote:
New webrev coming up soon...
Here it is:
http://cr.openjdk.java.net/~ihse/JDK-8172312-combined-javadocs/webrev.02
Changes since last webrev:
* Removed java.base from DOCS_MODULES and updated comment.
* Removed jdk.crypto.mscapi and jdk.crypto.ucrypto from DOCS_MODULES.
* Replaced JAVADOC_SOURCE_DIRS with
JAVADOC_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) \
$(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub)
and added it to JAVADOC_VARDEPS
* Fixed JAVADOC_TOP indentation
* Removed java.base from list of modules for reference javase javadoc
* Updated REFERENCE_TARGET_DIR to $(IMAGES_OUTPUTDIR)/javase-docs/api
/Magnus
