aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkevinw <unknown>2019-03-12 09:52:35 -0700
committerbell-sw <liberica@bell-sw.com>2019-04-20 16:51:49 +0300
commit32bd6e63232d88a007aa4670f6bb9668bd672922 (patch)
tree77a092ea7e493692f1cf62e9926f8492b1165d69
parent8d5f7e23f6db8ee4a116b40c6004bfb45e7989d3 (diff)
downloadjdk8u-32bd6e63232d88a007aa4670f6bb9668bd672922.tar.gz
8217305: Missing 0 in java.dll file version cause issues with patch management software
Reviewed-by: shade
-rw-r--r--common/autoconf/flags.m42
-rw-r--r--common/autoconf/generated-configure.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4
index 55b9a25..9c73e42 100644
--- a/common/autoconf/flags.m4
+++ b/common/autoconf/flags.m4
@@ -111,7 +111,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
-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)\""
+ -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
fi
AC_SUBST(RC_FLAGS)
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 465e227..7f76ade 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4358,7 +4358,7 @@ VS_SDK_PLATFORM_NAME_2017=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1551441508
+DATE_WHEN_GENERATED=1552344461
###############################################################################
#
@@ -40540,7 +40540,7 @@ $as_echo "$tool_specified" >&6; }
-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)\""
+ -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
fi