RFR: 9/8u40 8062475: Enable hook for custom doc generation
roger riggs
roger.riggs at oracle.com
Fri Oct 31 13:44:17 UTC 2014
Hi,
Thanks for the recommendations, updated webrevs:
JDK 9 webrev:
http://cr.openjdk.java.net/~rriggs/webrev-custom-javadoc-jdk9/
JDK 8u webrev:
http://cr.openjdk.java.net/~rriggs/webrev-javadoc-custom-jdk8u/
Thanks, Roger
On 10/31/2014 5:17 AM, Erik Joelsson wrote:
> Hello Roger,
>
> The same bug should be ok, but there will be some differences in the
> changes so separate reviews will be needed.
>
> Another difference between JDK 8 and JDK 9 is that we have the top
> level closed repo in JDK 9 and a closed Javadoc.gmk belongs in that
> repo and not jdk/make/closed.
good to know.
>
> It's correct that in JDK 8 you will need to use -include.
>
> /Erik
>
> On 2014-10-30 18:20, roger riggs wrote:
>> Hi Erik,
>>
>> Thanks for the comments and recommendations.
>> Though the new macro is not applicable to 8u40 and I'll need to use
>> the original form of -include.
>>
>> Do I need a separate bug/review/webrev for 8u40?
>>
>> The webrev is updated:
>> http://cr.openjdk.java.net/~rriggs/webrev-custom-javadoc/
>>
>> Thanks, Roger
>>
>>
>>
>> On 10/30/2014 4:32 AM, Erik Joelsson wrote:
>>> Hello Roger,
>>>
>>> I JDK 9 we introduced a macro call that handles custom inclusion
>>> instead of directly doing -include. Look for example in
>>> make/common/MakeBase.gmk.
>>>
>>> # Hook to include the corresponding custom file, if present.
>>> $(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
>>>
>>> Our definition of the macro can be found in custom-spec.gmk. It will
>>> refrain from including if --enable-openjdk-only is specified to
>>> configure.
>>>
>>> In JDK 8, your patch is correct, but there you need to guard the
>>> contents of the custom Javadoc.gmk with "ifndef OPENJDK".
>>>
>>> /Erik
>>>
>>> On 2014-10-29 20:56, roger riggs wrote:
>>>> To enable generating additional javadoc from the CUSTOM_MAKE_DIR
>>>> directory please review:
>>>>
>>>> Webrev:
>>>> http://cr.openjdk.java.net/~rriggs/webrev-custom-javadoc/
>>>>
>>>> Issue:
>>>> 8062475: Enable hook for custom doc generation
>>>>
>>>> Thanks, Roger
>>>>
>>>
>>
>
More information about the build-dev
mailing list