RFR (8u): 8209002: 8u192 installed exe and dll files have wrong file version

[Erik Joelsson]

Looks good to me.

/Erik


On 2018-08-29 05:29, Kevin Walls wrote:
> Hi,
>
> I'd like to get a review of:
>
> 8209002: 8u192 installed exe and dll files have wrong file version
> https://bugs.openjdk.java.net/browse/JDK-8209002
>
> Previous changes have changed the versions used by RC_FLAGS which 
> changes the versions appearing in Windows binaries.
>
> Diff below, tests well for my builds.  flags.m4 changes, plus autogen 
> files rebuilt.
>
> Thanks
> Kevin
>
>
> bash-4.2$ hg diff
> diff -r 866ed739fa56 common/autoconf/flags.m4
> --- a/common/autoconf/flags.m4  Tue Jul 24 09:51:59 2018 -0700
> +++ b/common/autoconf/flags.m4  Wed Aug 29 05:24:22 2018 -0700
> @@ -108,7 +108,7 @@
>          -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
>          -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
>          -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) 
> binary\" \
> -        -d 
> \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if 
> \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" 
> \
> +        -d 
> \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" 
> \
>          -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
>          -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) 
> \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
>          -d 
> \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if 
> \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
> diff -r 866ed739fa56 common/autoconf/generated-configure.sh
> --- a/common/autoconf/generated-configure.sh    Tue Jul 24 09:51:59 
> 2018 -0700
> +++ b/common/autoconf/generated-configure.sh    Wed Aug 29 05:24:22 
> 2018 -0700
> @@ -4336,7 +4336,7 @@
>  #CUSTOM_AUTOCONF_INCLUDE
>
>  # Do not change or remove the following line, it is needed for 
> consistency checks:
> -DATE_WHEN_GENERATED=1532008852
> +DATE_WHEN_GENERATED=1535545082
>
>  ############################################################################### 
>
>  #
> @@ -40504,7 +40504,7 @@
>          -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
>          -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
>          -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) 
> binary\" \
> -        -d 
> \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if 
> \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" 
> \
> +        -d 
> \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" 
> \
>          -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
>          -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) 
> \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
>          -d 
> \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if 
> \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
>
>
>
>