changeset 1771:4c7275c964b3

8135083: Product version string for DLLs and EXEs should not include trailing zeros Reviewed-by: katleman, iris, ihse
author dtitov
date Thu, 10 Sep 2015 09:04:42 +0200
parents 35e118e5bcb4
children ec282bb82ad9
files common/autoconf/flags.m4 common/autoconf/generated-configure.sh
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/flags.m4	Tue Sep 08 10:24:22 2015 -0700
+++ b/common/autoconf/flags.m4	Thu Sep 10 09:04:42 2015 +0200
@@ -102,7 +102,7 @@
         -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
         -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
         -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-        -D\"JDK_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
+        -D\"JDK_VER=\$(VERSION_NUMBER)\" \
         -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
         -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_MAJOR)\" \
         -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
--- a/common/autoconf/generated-configure.sh	Tue Sep 08 10:24:22 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Sep 10 09:04:42 2015 +0200
@@ -4438,7 +4438,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1436819493
+DATE_WHEN_GENERATED=1441868573
 
 ###############################################################################
 #
@@ -41521,7 +41521,7 @@
         -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
         -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
         -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
-        -D\"JDK_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
+        -D\"JDK_VER=\$(VERSION_NUMBER)\" \
         -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
         -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_MAJOR)\" \
         -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""