Tue, 09 Jun 2015 11:23:57 -0700
Merge
1.1 --- a/common/autoconf/generated-configure.sh Wed Jun 03 08:16:56 2015 -0700 1.2 +++ b/common/autoconf/generated-configure.sh Tue Jun 09 11:23:57 2015 -0700 1.3 @@ -800,6 +800,7 @@ 1.4 JAVA_CHECK 1.5 JAVAC_CHECK 1.6 COOKED_BUILD_NUMBER 1.7 +COOKED_JDK_UPDATE_VERSION 1.8 JDK_VERSION 1.9 COPYRIGHT_YEAR 1.10 MACOSX_BUNDLE_ID_BASE 1.11 @@ -3878,7 +3879,7 @@ 1.12 #CUSTOM_AUTOCONF_INCLUDE 1.13 1.14 # Do not change or remove the following line, it is needed for consistency checks: 1.15 -DATE_WHEN_GENERATED=1430836833 1.16 +DATE_WHEN_GENERATED=1433258489 1.17 1.18 ############################################################################### 1.19 # 1.20 @@ -11294,6 +11295,12 @@ 1.21 fi 1.22 1.23 1.24 +# The cooked update version used to encode trailing letters in the update 1.25 + # version into a trailing number. That is no longer needed, but need to 1.26 + # keep the format in 8u for compatibility. 1.27 + COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" 1.28 + 1.29 + 1.30 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 1.31 1.32 1.33 @@ -24194,10 +24201,10 @@ 1.34 -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \ 1.35 -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \ 1.36 -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ 1.37 - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \ 1.38 + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \ 1.39 -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ 1.40 -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ 1.41 - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" 1.42 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\"" 1.43 1.44 # lib.exe is used to create static libraries. 1.45 # Extract the first word of "lib", so it can be a program name with args.
2.1 --- a/common/autoconf/jdk-options.m4 Wed Jun 03 08:16:56 2015 -0700 2.2 +++ b/common/autoconf/jdk-options.m4 Tue Jun 09 11:23:57 2015 -0700 2.3 @@ -531,6 +531,12 @@ 2.4 fi 2.5 AC_SUBST(JDK_VERSION) 2.6 2.7 + # The cooked update version used to encode trailing letters in the update 2.8 + # version into a trailing number. That is no longer needed, but need to 2.9 + # keep the format in 8u for compatibility. 2.10 + COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0" 2.11 + AC_SUBST(COOKED_JDK_UPDATE_VERSION) 2.12 + 2.13 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 2.14 AC_SUBST(COOKED_BUILD_NUMBER) 2.15 ])
3.1 --- a/common/autoconf/spec.gmk.in Wed Jun 03 08:16:56 2015 -0700 3.2 +++ b/common/autoconf/spec.gmk.in Tue Jun 09 11:23:57 2015 -0700 3.3 @@ -167,6 +167,7 @@ 3.4 # Different version strings generated from the above information. 3.5 JDK_VERSION:=@JDK_VERSION@ 3.6 RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) 3.7 +COOKED_JDK_UPDATE_VERSION:=@COOKED_JDK_UPDATE_VERSION@ 3.8 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ 3.9 # These variables need to be generated here so that MILESTONE and 3.10 # JDK_BUILD_NUMBER can be overridden on the make command line.
4.1 --- a/common/autoconf/toolchain.m4 Wed Jun 03 08:16:56 2015 -0700 4.2 +++ b/common/autoconf/toolchain.m4 Tue Jun 09 11:23:57 2015 -0700 4.3 @@ -492,10 +492,10 @@ 4.4 -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \ 4.5 -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \ 4.6 -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \ 4.7 - -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \ 4.8 + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \ 4.9 -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \ 4.10 -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \ 4.11 - -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\"" 4.12 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\"" 4.13 4.14 # lib.exe is used to create static libraries. 4.15 AC_CHECK_PROG([WINAR], [lib],[lib],,,)