aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkevinw <none@none>2018-08-29 09:23:15 -0700
committerkevinw <none@none>2018-08-29 09:23:15 -0700
commit7b6b6c6fb1f8f522967a505f841ac7b38a2061ba (patch)
tree02dd1e0ace16fd5ad1a655607f1f4b67b79926af
parent96ea58e6b77439041adf83c731136fd202e239fa (diff)
downloadjdk8u-7b6b6c6fb1f8f522967a505f841ac7b38a2061ba.tar.gz
8209002: 8u192 installed exe and dll files have wrong file version
Reviewed-by: erikj
-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 9ef9b1a..c586b7f 100644
--- a/common/autoconf/flags.m4
+++ b/common/autoconf/flags.m4
@@ -108,7 +108,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
-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)\""
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 7c395df..bc93293 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -4336,7 +4336,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=1532008852
+DATE_WHEN_GENERATED=1535545082
###############################################################################
#
@@ -40504,7 +40504,7 @@ $as_echo "$tool_specified" >&6; }
-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)\""