jdk8-mips64-public: changeset 1514:760c71b8c3f4

     1.1 --- a/.hgtags	Mon Jun 15 11:38:02 2015 -0700
     1.2 +++ b/.hgtags	Wed Jun 17 23:21:18 2015 -0700
     1.3 @@ -444,6 +444,7 @@
     1.4  ec24cc303a2cfeb10ff0a5fb7b3d49ef47bb66f7 jdk8u60-b17
     1.5  d1d9eb953fbbe1f63a6badb0742508ae5f0d3ab5 jdk8u60-b18
     1.6  ff2ddaa4ea3292e2f0931a9a0c3feb33288d7d7f jdk8u60-b19
     1.7 +c641f979dff0d28dcdc4f303e9d93dda3079a456 jdk8u60-b20
     1.8  45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u52-b06
     1.9  2b07cd3f89aab19a2f7f119f3d885b776342efcc jdk8u52-b07
    1.10  45d4ff3a4f04fd676140bfe0a1b152618d684c9b jdk8u65-b00

     2.1 --- a/common/autoconf/generated-configure.sh	Mon Jun 15 11:38:02 2015 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Wed Jun 17 23:21:18 2015 -0700
     2.3 @@ -800,6 +800,7 @@
     2.4  JAVA_CHECK
     2.5  JAVAC_CHECK
     2.6  COOKED_BUILD_NUMBER
     2.7 +COOKED_JDK_UPDATE_VERSION
     2.8  JDK_VERSION
     2.9  COPYRIGHT_YEAR
    2.10  MACOSX_BUNDLE_ID_BASE
    2.11 @@ -3878,7 +3879,7 @@
    2.12  #CUSTOM_AUTOCONF_INCLUDE
    2.13  
    2.14  # Do not change or remove the following line, it is needed for consistency checks:
    2.15 -DATE_WHEN_GENERATED=1430836833
    2.16 +DATE_WHEN_GENERATED=1433258489
    2.17  
    2.18  ###############################################################################
    2.19  #
    2.20 @@ -11294,6 +11295,12 @@
    2.21    fi
    2.22  
    2.23  
    2.24 +# The cooked update version used to encode trailing letters in the update
    2.25 +  # version into a trailing number. That is no longer needed, but need to
    2.26 +  # keep the format in 8u for compatibility.
    2.27 +  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
    2.28 +
    2.29 +
    2.30    COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
    2.31  
    2.32  
    2.33 @@ -24194,10 +24201,10 @@
    2.34        -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
    2.35        -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
    2.36        -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
    2.37 -      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
    2.38 +      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
    2.39        -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
    2.40        -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
    2.41 -      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
    2.42 +      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
    2.43  
    2.44    # lib.exe is used to create static libraries.
    2.45    # Extract the first word of "lib", so it can be a program name with args.

     3.1 --- a/common/autoconf/jdk-options.m4	Mon Jun 15 11:38:02 2015 -0700
     3.2 +++ b/common/autoconf/jdk-options.m4	Wed Jun 17 23:21:18 2015 -0700
     3.3 @@ -531,6 +531,12 @@
     3.4    fi
     3.5    AC_SUBST(JDK_VERSION)
     3.6  
     3.7 +  # The cooked update version used to encode trailing letters in the update
     3.8 +  # version into a trailing number. That is no longer needed, but need to
     3.9 +  # keep the format in 8u for compatibility.
    3.10 +  COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"
    3.11 +  AC_SUBST(COOKED_JDK_UPDATE_VERSION)
    3.12 +
    3.13    COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
    3.14    AC_SUBST(COOKED_BUILD_NUMBER)
    3.15  ])

     4.1 --- a/common/autoconf/spec.gmk.in	Mon Jun 15 11:38:02 2015 -0700
     4.2 +++ b/common/autoconf/spec.gmk.in	Wed Jun 17 23:21:18 2015 -0700
     4.3 @@ -167,6 +167,7 @@
     4.4  # Different version strings generated from the above information.
     4.5  JDK_VERSION:=@JDK_VERSION@
     4.6  RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
     4.7 +COOKED_JDK_UPDATE_VERSION:=@COOKED_JDK_UPDATE_VERSION@
     4.8  COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
     4.9  # These variables need to be generated here so that MILESTONE and
    4.10  # JDK_BUILD_NUMBER can be overridden on the make command line.

     5.1 --- a/common/autoconf/toolchain.m4	Mon Jun 15 11:38:02 2015 -0700
     5.2 +++ b/common/autoconf/toolchain.m4	Wed Jun 17 23:21:18 2015 -0700
     5.3 @@ -492,10 +492,10 @@
     5.4        -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
     5.5        -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
     5.6        -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
     5.7 -      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
     5.8 +      -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(COOKED_JDK_UPDATE_VERSION).\$(COOKED_BUILD_NUMBER)\" \
     5.9        -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
    5.10        -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
    5.11 -      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
    5.12 +      -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(COOKED_JDK_UPDATE_VERSION),\$(COOKED_BUILD_NUMBER)\""
    5.13  
    5.14    # lib.exe is used to create static libraries.
    5.15    AC_CHECK_PROG([WINAR], [lib],[lib],,,)

Mercurial > jdk8-mips64-public / changeset

changeset

Merge jdk8u65-b02