[8u-dev] Request for approval: 8177026: jvm.dll file version not updated since 8u72

[Rob McKenna]

Approved

    -Rob

On 08/09/17 01:33, Kevin Walls wrote:
> Thanks Magnus!
> 
> 
> 
> On 08/09/2017 10:59, Magnus Ihse Bursie wrote:
> >This looks good to me from a build perspective.
> >
> >/Magnus
> >
> >On 2017-09-06 13:49, Kevin Walls wrote:
> >>Hi,
> >>
> >>I'd like approval for a small change in a windows-only build/resource
> >>file for the hotspot jvm.dll. We have been using stale FileVersion
> >>information for a while.
> >>
> >>The 8u bug is:
> >>
> >>8177026: jvm.dll file version not updated since 8u72
> >>https://bugs.openjdk.java.net/browse/JDK-8177026
> >>
> >>HS_VER stopped being updated with:
> >>https://bugs.openjdk.java.net/browse/JDK-8079410
> >>8079410: Hotspot version to share the same update and build version from
> >>JDK
> >>
> >>...in which we stop updating hotspot/make/hotspot_version with the new
> >>hotspot version numbers at each build, and just use JDK versions
> >>(hotspot update and build numbers simply followed the JDK numbers). 
> >>However the Windows build uses that state info.
> >>
> >>
> >>The change wanted is a clean backport of a few lines, which are a subset
> >>from a bundle of build-related changes in one bug in jdk9. (The 8 bug is
> >>marked 9-na because at that point it was not a problem in 9...)
> >>
> >>The 9 bug is:
> >>https://bugs.openjdk.java.net/browse/JDK-8149647
> >>8149647: Incremental enhancements from build-infra
> >>
> >>
> >>In hotspot/src/os/windows/vm/version.rc we should not use HS_VER as that
> >>is stale.  We should use JDK_VER.
> >>
> >>Diff for 8u/hotspot is below, which follows the version.rc change from
> >>8149647.
> >>
> >>Many thanks
> >>Kevin
> >>
> >>
> >>bash-4.2$ cd jdk8u/hotspot
> >>bash-4.2$ hg diff
> >>diff -r 16939858a716 src/os/windows/vm/version.rc
> >>--- a/src/os/windows/vm/version.rc      Mon Aug 21 11:34:41 2017 -0400
> >>+++ b/src/os/windows/vm/version.rc      Tue Aug 22 13:03:28 2017 -0700
> >>@@ -36,7 +36,7 @@
> >> //
> >>
> >> VS_VERSION_INFO VERSIONINFO
> >>- FILEVERSION    HS_VER
> >>+ FILEVERSION    JDK_VER
> >>  PRODUCTVERSION JDK_VER
> >>  FILEFLAGSMASK 0x3fL
> >> #ifdef _DEBUG
> >>@@ -56,7 +56,7 @@
> >>         BEGIN
> >>             VALUE "CompanyName", XSTR(HS_COMPANY) "\0"
> >>             VALUE "FileDescription", XSTR(HS_FILEDESC) "\0"
> >>-            VALUE "FileVersion",      XSTR(HS_DOTVER) "\0"
> >>+            VALUE "FileVersion", XSTR(JDK_DOTVER) "\0"
> >>             VALUE "Full Version", XSTR(HS_BUILD_ID) "\0"
> >>            VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0"
> >>             VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0"
> >>bash-4.2$
> >>
> >>
> >
>