Contribution to make/Docs.gmk

[Erik Joelsson]

Hello,

On 2018-03-08 06:51, Archana Nogriya wrote:
> Hi,
>
> In "make/Docs.gmk" We have found 2 issues which required to be fixed in
> OpenJDK,
>
> 1)
> -JDK_MODULES := $(sort $(DOCS_MODULES))
> +JDK_MODULES := $(sort $(filter-out $(MODULES_FILTER), $(DOCS_MODULES)))
>
> ==> This is an OpenJDK bug as this should be filtering out the
> MODULES_FILTER modules... hence required contribute to OpenJDK...
Yes, this makes sense. The filter should apply here too.
> 2)
> -JVMTI_HTML :=
> $(HOTSPOT_OUTPUTDIR)/variant-$(JVM_VARIANT_MAIN)/gensrc/jvmtifiles/jvmti.html
> -$(eval $(call SetupCopyFiles, COPY_JVMTI_HTML, \
>
>          FILES := $(JVMTI_HTML), \
>          DEST := $(DOCS_OUTPUTDIR)/specs,
> -))
> -JDK_SPECS_TARGETS += $(COPY_JVMTI_HTML)
> +#JVMTI_HTML :=
> $(HOTSPOT_OUTPUTDIR)/variant-$(JVM_VARIANT_MAIN)/gensrc/jvmtifiles/jvmti.html
> +#$(eval $(call SetupCopyFiles, COPY_JVMTI_HTML,
> +# FILES := $(JVMTI_HTML),
> +# DEST := $(DOCS_OUTPUTDIR)/specs,
> +#))
> +#JDK_SPECS_TARGETS += $(COPY_JVMTI_HTML)
>
> ==> We need to be able to unset/filterout the $(COPY_JVMTI_HTML) value in
> JDK_SPECS_TARGETS, if we get a "post" CustomIncludeExtension added at the
> end of Docs.gmk we can then the unset/filterout $(COPY_JVMTI_HTML) value.
> Hence OpenJDK contribution required.
>
Adding pre and post hooks to (almost) any .gmk file should not be a 
problem. It is the preferred solution here.

/Erik
> Please would like to hear other views on this fix and if we have better
> way of dealing this.
>
>
> Thanks and Regards
> Archana Nogriya
> IBM Java Runtime, Open Java Developer
> IBM Hursley
> Tel: Internal - 247073, External - +44 (0) 1962 81 7073
> Office Mobile: 07500095480
> Email: archana.nogriya at uk.ibm.com
>
> Unless stated otherwise above:
> IBM United Kingdom Limited - Registered in England and Wales with number
> 741598.
> Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU