Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs
Ahh I see , some reason git diff gave this wired result :). Right so change is only one line, JVMTI_HTML ?= $(HOTSPOT_OUTPUTDIR)/variant-$(JVM_VARIANT_MAIN)/gensrc/jvmtifiles/jvmti.html adding conditional parameter and then in our extension we can set JVMTI_HTML with openj9 specs html. Thanks Erik, Thanks and Regards Archana Nogriya From: Erik Joelsson <erik.joels...@oracle.com> To: Archana Nogriya <archana.nogr...@uk.ibm.com> Cc: build-dev@openjdk.java.net, David Holmes <david.hol...@oracle.com> Date: 30/04/2018 16:14 Subject:Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs Hello, On 2018-04-30 04:14, Archana Nogriya wrote: However the patch for the second part is related to locating jvmti.html, VM's like openj9 has it's own html specs file in different location hence we need extension to set it appropriately. Yes, I see the reason for the change, but my concern was that the patch below looks like it's changing 6 lines, but in reality, I can only see a difference in one of them. That difference is also the only difference needed as far as I can see. I just want confirmation that that is the case. /Erik # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical). -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) Thanks and Regards Archana Nogriya From:Erik Joelsson <erik.joels...@oracle.com> To:Archana Nogriya <archana.nogr...@uk.ibm.com> Cc:build-dev@openjdk.java.net, David Holmes <david.hol...@oracle.com> Date:27/04/2018 18:05 Subject:Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs Looking at this again, the first part, in Main.gmk, has already been addressed in https://bugs.openjdk.java.net/browse/JDK-8198425. The patch for the second part looks weird. The only real change I can see is the ?= for the jvmti.html file. The rest looks like there is no difference (and I cannot think of any change needed there either). /Erik On 2018-04-27 02:12, Archana Nogriya wrote: Thanks Erik, It will be great if you can sponsor for this contribution please. 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.nogr...@uk.ibm.com From:Erik Joelsson <erik.joels...@oracle.com> To:Archana Nogriya <archana.nogr...@uk.ibm.com>, build-dev@openjdk.java.net Cc:David Holmes <david.hol...@oracle.com> Date:26/04/2018 17:15 Subject:Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs Looks reasonable. /Erik On 2018-04-26 04:00, Archana Nogriya wrote: If we have a conditional variable to set " hotspot-$(JVM_VARIANT_MAIN)-gensrc" target then this can give way to alternate VMs like eclipse openj9 to extend that to set it appropriately. diff --git a/make/Main.gmk b/make/Main.gmk index 731e9c9934..444a835cb4 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -830,7 +830,8 @@ else docs-reference-api-modulegraph: exploded-image buildtools-modules # The gensrc steps for hotspot and jdk.jdi create html spec files. - docs-jdk-specs: jdk.jdi-gensrc \ + JVM_DOCS_SPEC_TARGET ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc + docs-jdk-specs: $(JVM_DOCS_SPEC_TARGET) jdk.jdi-gensrc \ docs-jdk-index ## diff --git a/make/Docs.gmk b/make/Docs.gmk index 644ffbf74a..73ffb8ebd2 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -561,12 +561,12 @@ $(eval $(call SetupCopyFiles, COPY_JDWP_PROTOCOL, \ JDK_SPECS_TARGETS += $(COPY_JDWP_PROTOCOL) # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical). -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) Note: This proposal has been tested in local. T
Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs
Thanks Erik agree with you, the changes from JDK11 you mentioned is very similar to what I propose and that will serve the purpose. However the patch for the second part is related to locating jvmti.html, VM's like openj9 has it's own html specs file in different location hence we need extension to set it appropriately. # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical). -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) Thanks and Regards Archana Nogriya From: Erik Joelsson <erik.joels...@oracle.com> To: Archana Nogriya <archana.nogr...@uk.ibm.com> Cc: build-dev@openjdk.java.net, David Holmes <david.hol...@oracle.com> Date: 27/04/2018 18:05 Subject:Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs Looking at this again, the first part, in Main.gmk, has already been addressed in https://bugs.openjdk.java.net/browse/JDK-8198425. The patch for the second part looks weird. The only real change I can see is the ?= for the jvmti.html file. The rest looks like there is no difference (and I cannot think of any change needed there either). /Erik On 2018-04-27 02:12, Archana Nogriya wrote: Thanks Erik, It will be great if you can sponsor for this contribution please. 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.nogr...@uk.ibm.com From:Erik Joelsson <erik.joels...@oracle.com> To:Archana Nogriya <archana.nogr...@uk.ibm.com>, build-dev@openjdk.java.net Cc:David Holmes <david.hol...@oracle.com> Date:26/04/2018 17:15 Subject:Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs Looks reasonable. /Erik On 2018-04-26 04:00, Archana Nogriya wrote: If we have a conditional variable to set " hotspot-$(JVM_VARIANT_MAIN)-gensrc" target then this can give way to alternate VMs like eclipse openj9 to extend that to set it appropriately. diff --git a/make/Main.gmk b/make/Main.gmk index 731e9c9934..444a835cb4 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -830,7 +830,8 @@ else docs-reference-api-modulegraph: exploded-image buildtools-modules # The gensrc steps for hotspot and jdk.jdi create html spec files. - docs-jdk-specs: jdk.jdi-gensrc \ + JVM_DOCS_SPEC_TARGET ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc + docs-jdk-specs: $(JVM_DOCS_SPEC_TARGET) jdk.jdi-gensrc \ docs-jdk-index ## diff --git a/make/Docs.gmk b/make/Docs.gmk index 644ffbf74a..73ffb8ebd2 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -561,12 +561,12 @@ $(eval $(call SetupCopyFiles, COPY_JDWP_PROTOCOL, \ JDK_SPECS_TARGETS += $(COPY_JDWP_PROTOCOL) # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical). -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) Note: This proposal has been tested in local. 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.nogr...@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 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 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
Contribution to make/Docs.gmk
I am looking for reviewer and sponsor for this contribution, Is anyone who can review this please and happy to sponsor for this contribution as appropriate. Hi, "make/Docs.gmk", JDK_MODULES is only sorted with DOCS_MODULES, where It should also filter-out MODULES_FILTER for javadocs modules. # All modules to have docs generated by docs-jdk-api target >> -JDK_MODULES := $(sort $(DOCS_MODULES)) >> +JDK_MODULES := $(sort $(filter-out $(MODULES_FILTER), $(DOCS_MODULES))) 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.nogr...@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 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
Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs
Thanks Erik, It will be great if you can sponsor for this contribution please. 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.nogr...@uk.ibm.com From: Erik Joelsson <erik.joels...@oracle.com> To: Archana Nogriya <archana.nogr...@uk.ibm.com>, build-dev@openjdk.java.net Cc: David Holmes <david.hol...@oracle.com> Date: 26/04/2018 17:15 Subject:Re: Extensionality Improvement in Main.gmk & Docs.gmk to generate docs Looks reasonable. /Erik On 2018-04-26 04:00, Archana Nogriya wrote: If we have a conditional variable to set " hotspot-$(JVM_VARIANT_MAIN)-gensrc" target then this can give way to alternate VMs like eclipse openj9 to extend that to set it appropriately. diff --git a/make/Main.gmk b/make/Main.gmk index 731e9c9934..444a835cb4 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -830,7 +830,8 @@ else docs-reference-api-modulegraph: exploded-image buildtools-modules # The gensrc steps for hotspot and jdk.jdi create html spec files. - docs-jdk-specs: jdk.jdi-gensrc \ + JVM_DOCS_SPEC_TARGET ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc + docs-jdk-specs: $(JVM_DOCS_SPEC_TARGET) jdk.jdi-gensrc \ docs-jdk-index ## diff --git a/make/Docs.gmk b/make/Docs.gmk index 644ffbf74a..73ffb8ebd2 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -561,12 +561,12 @@ $(eval $(call SetupCopyFiles, COPY_JDWP_PROTOCOL, \ JDK_SPECS_TARGETS += $(COPY_JDWP_PROTOCOL) # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical). -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) Note: This proposal has been tested in local. 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.nogr...@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 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
Extensionality Improvement in Main.gmk & Docs.gmk to generate docs
If we have a conditional variable to set " hotspot-$(JVM_VARIANT_MAIN)-gensrc" target then this can give way to alternate VMs like eclipse openj9 to extend that to set it appropriately. diff --git a/make/Main.gmk b/make/Main.gmk index 731e9c9934..444a835cb4 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -830,7 +830,8 @@ else docs-reference-api-modulegraph: exploded-image buildtools-modules # The gensrc steps for hotspot and jdk.jdi create html spec files. - docs-jdk-specs: jdk.jdi-gensrc \ + JVM_DOCS_SPEC_TARGET ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc + docs-jdk-specs: $(JVM_DOCS_SPEC_TARGET) jdk.jdi-gensrc \ docs-jdk-index ## diff --git a/make/Docs.gmk b/make/Docs.gmk index 644ffbf74a..73ffb8ebd2 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -561,12 +561,12 @@ $(eval $(call SetupCopyFiles, COPY_JDWP_PROTOCOL, \ JDK_SPECS_TARGETS += $(COPY_JDWP_PROTOCOL) # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical). -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) Note: This proposal has been tested in local. 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.nogr...@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
Contribution to make/Docs.gmk
Hi, "make/Docs.gmk", JDK_MODULES is only sorted with DOCS_MODULES, where It should also filter-out MODULES_FILTER for javadocs modules. # All modules to have docs generated by docs-jdk-api target >> -JDK_MODULES := $(sort $(DOCS_MODULES)) >> +JDK_MODULES := $(sort $(filter-out $(MODULES_FILTER), $(DOCS_MODULES))) 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.nogr...@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
Re: Contribution to make/Docs.gmk
Thanks David, Erik for your response. JVMTI is a generic JVM debug specification, J9 has it's own version of it. As per J9 requirement, we might want to be able to do is filter out the above from JDK_SPECS_TARGETS, and add J9 one if it exists currently Docs.gmk I do not see .post custom extension point and to use our own version we need a way of doing it. 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.nogr...@uk.ibm.com From: David Holmes <david.hol...@oracle.com> To: Archana Nogriya <archana.nogr...@uk.ibm.com>, build-dev@openjdk.java.net Date: 08/03/2018 21:26 Subject:Re: Contribution to make/Docs.gmk Hi, On 9/03/2018 12:51 AM, 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... > > 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. Why do you think the JVM TI specification should not be part of the JDK_SPECS_TARGET? Is this just because it is in the hotspot part of the source tree? David > 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.nogr...@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 > 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
Contribution to make/Docs.gmk
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... 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. 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.nogr...@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
Contribute towards native code which override to OpenJDK
Hi, Why this contribution is required These changes are to support the override of native C/C++ source by the SetupNativeCompilation macro in a similar way to how java classes can be overridden in SetupJavaCompilation. This will enable extension/closed source providers to easily override native implementations. Changes were made in: make/common/NativeCompilation.gmk diff -r 3a52333a5e57 make/common/NativeCompilation.gmk --- a/make/common/NativeCompilation.gmk Tue Jan 02 16:35:04 2018 -0500 +++ b/make/common/NativeCompilation.gmk Tue Jan 16 13:42:54 2018 + @@ -511,8 +511,14 @@ $$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) # Find all files in the source trees. Preserve order. - $1_SRCS := $$(foreach s, $$($1_SRC), $$(call CacheFind,$$(s))) + $1_SRCS := $$(call uniq, $$(foreach s, $$($1_SRC), $$(call CacheFind,$$(s $1_SRCS := $$(filter $$(NATIVE_SOURCE_EXTENSIONS), $$($1_SRCS)) + $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \ + $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \ +$$(if $$($1_$$(relative_src)), \ + $$(eval $1_NATIVE_EXCLUDE_FILES += $$(s)), \ + $$(eval $1_$$(relative_src) := 1) $$(s + $1_SRCS := $$(filter-out $$($1_NATIVE_EXCLUDE_FILES), $$($1_SRCS)) # Extract the C/C++ files. ifneq ($$($1_EXCLUDE_PATTERNS), ) # We must not match the exclude pattern against the src root(s). This new code has been tested by building with latest JDK11. Build has been successful. Please let me know what is your view on these changes and if we can contribute to openJDK. 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.nogr...@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
