On Wed, 16 Nov 2022 19:39:15 GMT, Magnus Ihse Bursie <i...@openjdk.org> wrote:
>> Julian Waters has updated the pull request with a new target base due to a >> merge or a rebase. The incremental webrev excludes the unrelated changes >> brought in by the merge/rebase. The pull request contains two additional >> commits since the last revision: >> >> - Merge remote-tracking branch 'upstream/master' into util >> - Squash > > make/autoconf/jdk-version.m4 line 95: > >> 93: UTIL_ARG_WITH(NAME: jdk-rc-name, TYPE: string, >> 94: DEFAULT: [$PRODUCT_NAME $JDK_RC_PLATFORM_NAME], >> 95: DESC: [Set JDK RC name. This is used for FileDescription and >> ProductName > > Please use `DEFAULT_DESC` instead of the old `@<:@...@:>@` construct. (This > too goes for all the instances) Embarrassingly I left it that way since I didn't know what `@<:@...@:>@` actually did. So the following replacement should work? DEFAULT_DESC: [Set JDK RC name. This is used for FileDescription and ProductName properties of MS Windows binaries.] > make/autoconf/jdk-version.m4 line 123: > >> 121: # The vendor URL, if any >> 122: # Only set VENDOR_URL if '--with-vendor-url' was used and is not >> empty. >> 123: # Otherwise we will use the value from "branding.conf" included above. > > I think this is actually a bit confusing, especially when put in focus like > this by your rewrite. Perhaps the values in branding.conf should be renamed > like `DEFAULT_VENDOR_URL`? That is what it is, after all -- even if you > modify branding.conf in a fork, it can still be overridden by configure > arguments. > > (This comment is also driven by the fact that I don't really like a > construction where the same value both goes into the UTIL_ARG_WITH as comes > out of it. If at all possible, I really like to avoid re-assigning values to > variables). Alright, I avoided changing those to keep the commit as small as possible, but I guess it's free game now that I have the green light ------------- PR: https://git.openjdk.org/jdk/pull/11020
