RFR: 8276654: element-list order is non deterministic [v2]

[Erik Joelsson]

On Fri, 5 Nov 2021 18:46:26 GMT, Andrew Leonard <aleonard at openjdk.org> wrote:

>> Fixes: https://bugs.openjdk.java.net/browse/JDK-8276654
>> 
>> A intermittent problem with the make dependencies means the jdk.javadoc element-list-.txt generation can remove the src defined element|package-list-<7,8,9,10>.txt files.
>> Recreatable by using --with-jobs=1 causing jdk.javadoc "gendata" to always occur after "java" module build dependency.
>> This fix puts a dependency of jdk.javadoc-java on jdk.javadoc-gendata to avoid this.
>> 
>> Signed-off-by: Andrew Leonard <anleonar at redhat.com>
>
> Andrew Leonard has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR.

make/modules/jdk.javadoc/Gendata.gmk line 75:

> 73: 	$(call MakeTargetDir)
> 74: 	$(call LogInfo, Creating javadoc element lists)
> 75: 	$(RM) $(ELEMENT_LISTS_DIR)/element-list-{$(call CommaList,$(call sequence,$(GENERATE_SYMBOLS_FROM_JDK_VERSION),$(JDK_SOURCE_TARGET_VERSION)))}.txt

Good to see that it worked! I would only wish that you found a way to break up the line. Long lines make future side-by-side reviews and 3-way merges hard. We don't enforce strict 80, but try to stay in some reasonable ballpark in the build files.

I think both CommaList and sequence are ok with whitespace in their parameters. Otherwise you could pre-calculate the numbers list in a variable before the recipe.

-------------

PR: https://git.openjdk.java.net/jdk/pull/6278