# HG changeset patch # User erikj # Date 1433321409 -7200 # Node ID 17e06bbf496ed4c3f01b97ed7e865c2dbdb103b6 # Parent d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 8074523: Windows native binaries have inconsistent 'Product version' Reviewed-by: ihse, tbell diff -r d1d9eb953fbb -r 17e06bbf496e common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Thu May 28 16:46:12 2015 -0700 +++ b/common/autoconf/generated-configure.sh Wed Jun 03 10:50:09 2015 +0200 @@ -800,6 +800,7 @@ JAVA_CHECK JAVAC_CHECK COOKED_BUILD_NUMBER +COOKED_JDK_UPDATE_VERSION JDK_VERSION COPYRIGHT_YEAR MACOSX_BUNDLE_ID_BASE @@ -3878,7 +3879,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1430836833 +DATE_WHEN_GENERATED=1433258489 ############################################################################### # @@ -11294,6 +11295,12 @@ fi +# The cooked update version used to encode trailing letters in the update + # version into a trailing number. That is no longer needed, but need to + # keep the format in 8u for compatibility. + COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" + + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` @@ -24194,10 +24201,10 @@ -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)\"" + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\"" # lib.exe is used to create static libraries. # Extract the first word of "lib", so it can be a program name with args. diff -r d1d9eb953fbb -r 17e06bbf496e common/autoconf/jdk-options.m4 --- a/common/autoconf/jdk-options.m4 Thu May 28 16:46:12 2015 -0700 +++ b/common/autoconf/jdk-options.m4 Wed Jun 03 10:50:09 2015 +0200 @@ -531,6 +531,12 @@ fi AC_SUBST(JDK_VERSION) + # The cooked update version used to encode trailing letters in the update + # version into a trailing number. That is no longer needed, but need to + # keep the format in 8u for compatibility. + COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" + AC_SUBST(COOKED_JDK_UPDATE_VERSION) + COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` AC_SUBST(COOKED_BUILD_NUMBER) ]) diff -r d1d9eb953fbb -r 17e06bbf496e common/autoconf/spec.gmk.in --- a/common/autoconf/spec.gmk.in Thu May 28 16:46:12 2015 -0700 +++ b/common/autoconf/spec.gmk.in Wed Jun 03 10:50:09 2015 +0200 @@ -167,6 +167,7 @@ # Different version strings generated from the above information. JDK_VERSION:=@JDK_VERSION@ RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) +COOKED_JDK_UPDATE_VERSION:=@COOKED_JDK_UPDATE_VERSION@ COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ # These variables need to be generated here so that MILESTONE and # JDK_BUILD_NUMBER can be overridden on the make command line. diff -r d1d9eb953fbb -r 17e06bbf496e common/autoconf/toolchain.m4 --- a/common/autoconf/toolchain.m4 Thu May 28 16:46:12 2015 -0700 +++ b/common/autoconf/toolchain.m4 Wed Jun 03 10:50:09 2015 +0200 @@ -492,10 +492,10 @@ -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)\"" + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\"" # lib.exe is used to create static libraries. AC_CHECK_PROG([WINAR], [lib],[lib],,,)