changeset 2360:1a10633a3a1d

Merge
author alitvinov
date Mon, 10 Sep 2018 16:17:39 +0100
parents 54ee1ff3842b 925286280bfa
children 0cfb160ceb80
files .hgtags
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Sep 07 10:18:54 2018 +0100
+++ b/.hgtags	Mon Sep 10 16:17:39 2018 +0100
@@ -887,6 +887,7 @@
 a8e49c4cae5e46b748ac9ddbc0befc87fea2a7d1 jdk8u191-b06
 2b457fbca0fc5bdf8e19cc0435fb989edcc15b36 jdk8u191-b07
 e5404b63db4a10aae7fa4a5639af5e08518c31e7 jdk8u191-b08
+4c2d3b4689ab5d92c42a4d1e1fa79db16de7bf06 jdk8u191-b09
 3b5b53db61f2aaa5a94fd9ca51162d83565faabe jdk8u182-b00
 dcfe85bcd9017741198b4e4a2045fdaaab212c74 jdk8u192-b00
 7abd14dd301d8a927450a7623c2e5913a5bfa891 jdk8u192-b01
@@ -897,3 +898,4 @@
 b88b6acd0e11adba0de591e562ca14d1d3d4347a jdk8u192-b06
 b96c7dda62dae179c8b885942d51b5f5f1e0905f jdk8u192-b07
 8f51ed70d93378f70d0288f8795f0bb0c64a6283 jdk8u192-b08
+d7057bcda329b0b4368d34465caefef5b3b15f0b jdk8u192-b09
--- a/common/autoconf/flags.m4	Fri Sep 07 10:18:54 2018 +0100
+++ b/common/autoconf/flags.m4	Mon Sep 10 16:17:39 2018 +0100
@@ -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)\""
--- a/common/autoconf/generated-configure.sh	Fri Sep 07 10:18:54 2018 +0100
+++ b/common/autoconf/generated-configure.sh	Mon Sep 10 16:17:39 2018 +0100
@@ -4336,7 +4336,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1533314440
+DATE_WHEN_GENERATED=1536078152
 
 ###############################################################################
 #
@@ -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)\""