make/windows/build.make

rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn

*** 115,125 ****
  #########################################################################
  # Parameters for VERSIONINFO resource for jvm.dll.
  # These can be overridden via the nmake.exe command line.
  # They are overridden by RE during the control builds.
  #
! !include "$(WorkSpace)/make/hotspot_version"
  
  # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
  # or make/hotspot_distro.
  !ifndef HOTSPOT_VM_DISTRO
  !if exists($(WorkSpace)\src\closed)
--- 115,125 ----
  #########################################################################
  # Parameters for VERSIONINFO resource for jvm.dll.
  # These can be overridden via the nmake.exe command line.
  # They are overridden by RE during the control builds.
  #
! !include "$(WorkSpace)/make/jdk_version"
  
  # Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
  # or make/hotspot_distro.
  !ifndef HOTSPOT_VM_DISTRO
  !if exists($(WorkSpace)\src\closed)
*** 161,171 ****
  # 1.5.0_<wx>-b<yz> will have DLL version 5.0.wx*10.yz
  # Thus, 1.5.0_10-b04  will be 5.0.100.4
  #       1.6.0-b01     will be 6.0.0.1
  #       1.6.0_01a-b02 will be 6.0.11.2
  #
! # JDK_* variables are defined in make/hotspot_version or on command line
  #
  JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER)
  JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER)
  !if "$(JRE_RELEASE_VERSION)" == ""
  JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)
--- 161,171 ----
  # 1.5.0_<wx>-b<yz> will have DLL version 5.0.wx*10.yz
  # Thus, 1.5.0_10-b04  will be 5.0.100.4
  #       1.6.0-b01     will be 6.0.0.1
  #       1.6.0_01a-b02 will be 6.0.11.2
  #
! # JDK_* variables are defined in make/jdk_version or on command line
  #
  JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER)
  JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER)
  !if "$(JRE_RELEASE_VERSION)" == ""
  JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)
*** 177,193 ****
  !endif
  
  # Hotspot Express VM FileVersion:
  # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers).
  #
- # HS_* variables are defined in make/hotspot_version
  #
! HS_VER=$(HS_MAJOR_VER),$(HS_MINOR_VER),0,$(HS_BUILD_NUMBER)
! HS_DOTVER=$(HS_MAJOR_VER).$(HS_MINOR_VER).0.$(HS_BUILD_NUMBER)
  
  !if "$(HOTSPOT_RELEASE_VERSION)" == ""
! HOTSPOT_RELEASE_VERSION=$(HS_MAJOR_VER).$(HS_MINOR_VER)-b$(HS_BUILD_NUMBER)
  !endif
  
  !if "$(HOTSPOT_BUILD_VERSION)" == ""
  HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)
  !else
--- 177,192 ----
  !endif
  
  # Hotspot Express VM FileVersion:
  # 10.0-b<yz> will have DLL version 10.0.0.yz (need 4 numbers).
  #
  #
! HS_VER=$(JDK_VER)
! HS_DOTVER=$(JDK_DOTVER)
  
  !if "$(HOTSPOT_RELEASE_VERSION)" == ""
! HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
  !endif
  
  !if "$(HOTSPOT_BUILD_VERSION)" == ""
  HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)
  !else