--- old/common/autoconf/configure.ac 2015-06-10 15:43:37.095125851 +0200 +++ new/common/autoconf/configure.ac 2015-06-10 15:43:36.983125849 +0200 @@ -46,6 +46,7 @@ m4_include([flags.m4]) m4_include([help.m4]) m4_include([jdk-options.m4]) +m4_include([jdk-version.m4]) m4_include([libraries.m4]) m4_include([platform.m4]) m4_include([source-dirs.m4]) @@ -135,7 +136,7 @@ # We need build & target for this. JDKOPT_SETUP_JDK_OPTIONS -JDKOPT_SETUP_JDK_VERSION_NUMBERS +JDKVER_SETUP_JDK_VERSION_NUMBERS ############################################################################### # --- old/common/autoconf/flags.m4 2015-06-10 15:43:37.531125858 +0200 +++ new/common/autoconf/flags.m4 2015-06-10 15:43:37.407125856 +0200 @@ -99,13 +99,13 @@ # The \$ are escaped to the shell, and the $(...) variables # are evaluated by make. RC_FLAGS="$RC_FLAGS \ - -D\"JDK_BUILD_ID=\$(FULL_VERSION)\" \ + -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -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=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \ -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_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_MAJOR)\" \ + -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" fi AC_SUBST(RC_FLAGS) @@ -636,10 +636,6 @@ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG" fi - # Setup release name - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'" - - # Set some additional per-OS defines. if test "x$OPENJDK_TARGET_OS" = xmacosx; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" --- old/common/autoconf/generated-configure.sh 2015-06-10 15:43:38.011125866 +0200 +++ new/common/autoconf/generated-configure.sh 2015-06-10 15:43:37.851125863 +0200 @@ -825,9 +825,17 @@ BOOT_JDK JAVA_CHECK JAVAC_CHECK -COOKED_BUILD_NUMBER -JDK_VERSION -COPYRIGHT_YEAR +VERSION_SHORT +VERSION_STRING +VERSION_NUMBER_FOUR_POSITIONS +VERSION_NUMBER +VERSION_OPT +VERSION_BUILD +VERSION_PRE +VERSION_PATCH +VERSION_SECURITY +VERSION_MINOR +VERSION_MAJOR MACOSX_BUNDLE_ID_BASE MACOSX_BUNDLE_NAME_BASE COMPANY_NAME @@ -835,13 +843,7 @@ PRODUCT_SUFFIX PRODUCT_NAME LAUNCHER_NAME -MILESTONE -JDK_BUILD_NUMBER -JDK_UPDATE_VERSION -JDK_MICRO_VERSION -JDK_MINOR_VERSION -JDK_MAJOR_VERSION -USER_RELEASE_SUFFIX +COPYRIGHT_YEAR COMPRESS_JARS RMICONNECTOR_IIOP UNLIMITED_CRYPTO @@ -1063,11 +1065,20 @@ with_cacerts_file enable_unlimited_crypto enable_rmiconnector_iiop +with_copyright_year with_milestone with_update_version with_user_release_suffix with_build_number -with_copyright_year +with_version_string +with_version_pre_base +with_version_pre_debuglevel +with_version_opt +with_version_build +with_version_major +with_version_minor +with_version_security +with_version_patch with_boot_jdk with_add_source_root with_override_source_root @@ -1909,13 +1920,34 @@ --with-builddeps-group chgrp the downloaded build dependencies to this group --with-cacerts-file specify alternative cacerts file - --with-milestone Set milestone value for build [internal] - --with-update-version Set update version value for build [b00] - --with-user-release-suffix - Add a custom string to the version string if build - number is not set.[username_builddateb00] - --with-build-number Set build number value for build [b00] --with-copyright-year Set copyright year value for build [current year] + --with-milestone Deprecated. Option is kept for backwards + compatibility and is ignored + --with-update-version Deprecated. Option is kept for backwards + compatibility and is ignored + --with-user-release-suffix + Deprecated. Option is kept for backwards + compatibility and is ignored + --with-build-number Deprecated. Option is kept for backwards + compatibility and is ignored + --with-version-string Set version string [calculated] + --with-version-pre-base Set the base part of the version 'PRE' field + (pre-release identifier) ['internal'] + --with-version-pre-debuglevel + Set the debug level part of the version 'PRE' field + (pre-release identifier) [current debug level] + --with-version-opt Set version 'OPT' field (build metadata) + [..] + --with-version-build Set version 'BUILD' field (build number) [not + specified] + --with-version-major Set version 'MAJOR' field (first number) [current + source value] + --with-version-minor Set version 'MINOR' field (second number) [current + source value] + --with-version-security Set version 'SECURITY' field (third number) [current + source value] + --with-version-patch Set version 'PATCH' field (fourth number) [not + specified] --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] --with-add-source-root for each and every source directory, look in this additional source root for the same directory; if it @@ -3825,7 +3857,7 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -3994,16 +4026,17 @@ + + ############################################################################### # -# Setup version numbers +# Enable or disable the elliptic curve crypto implementation # - ################################################################################ # # Gcov coverage data for hotspot @@ -4011,6 +4044,45 @@ # +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +############################################################################### +# +# Setup version numbers +# + +# Verify that a given string represents a valid version number, and assign it +# to a variable. + +# Argument 1: the variable to assign to +# Argument 2: the value given by the user + + + + +# # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -4366,7 +4438,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1432629750 +DATE_WHEN_GENERATED=1433857590 ############################################################################### # @@ -20088,12 +20160,6 @@ ############################################################################### # - # Enable or disable the elliptic curve crypto implementation - # - - - ############################################################################### - # # --enable-rmiconnector-iiop # # Check whether --enable-rmiconnector-iiop was given. @@ -20116,117 +20182,491 @@ + # Setup default copyright year. Mostly overridden when building close to a new year. - # Source the version numbers - . $AUTOCONF_DIR/version-numbers +# Check whether --with-copyright-year was given. +if test "${with_copyright_year+set}" = set; then : + withval=$with_copyright_year; +fi + + if test "x$with_copyright_year" = xyes; then + as_fn_error $? "Copyright year must have a value" "$LINENO" 5 + elif test "x$with_copyright_year" != x; then + COPYRIGHT_YEAR="$with_copyright_year" + else + COPYRIGHT_YEAR=`date +'%Y'` + fi + + + + # Warn user that old version arguments are deprecated. - # Get the settings from parameters # Check whether --with-milestone was given. if test "${with_milestone+set}" = set; then : - withval=$with_milestone; + withval=$with_milestone; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-milestone is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --with-milestone is deprecated and will be ignored." >&2;} fi - if test "x$with_milestone" = xyes; then - as_fn_error $? "Milestone must have a value" "$LINENO" 5 - elif test "x$with_milestone" != x; then - MILESTONE="$with_milestone" - fi - if test "x$MILESTONE" = x; then - MILESTONE=internal - fi + # Check whether --with-update-version was given. if test "${with_update_version+set}" = set; then : - withval=$with_update_version; + withval=$with_update_version; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-update-version is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --with-update-version is deprecated and will be ignored." >&2;} fi - if test "x$with_update_version" = xyes; then - as_fn_error $? "Update version must have a value" "$LINENO" 5 - elif test "x$with_update_version" != x; then - JDK_UPDATE_VERSION="$with_update_version" - # On macosx 10.7, it's not possible to set --with-update-version=0X due - # to a bug in expr (which reduces it to just X). To work around this, we - # always add a 0 to one digit update versions. - if test "${#JDK_UPDATE_VERSION}" = "1"; then - JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" - fi - fi + # Check whether --with-user-release-suffix was given. if test "${with_user_release_suffix+set}" = set; then : - withval=$with_user_release_suffix; + withval=$with_user_release_suffix; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-user-release-suffix is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --with-user-release-suffix is deprecated and will be ignored." >&2;} fi - if test "x$with_user_release_suffix" = xyes; then - as_fn_error $? "Release suffix must have a value" "$LINENO" 5 - elif test "x$with_user_release_suffix" != x; then - USER_RELEASE_SUFFIX="$with_user_release_suffix" - fi + # Check whether --with-build-number was given. if test "${with_build_number+set}" = set; then : - withval=$with_build_number; + withval=$with_build_number; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-build-number is deprecated and will be ignored." >&5 +$as_echo "$as_me: WARNING: Option --with-build-number is deprecated and will be ignored." >&2;} +fi + + + + # Source the version numbers file + . $AUTOCONF_DIR/version-numbers + + # Some non-version number information is set in that file + + + + + + + + + # Override version from arguments + + # If --with-version-string is set, process it first. It is possible to + # override parts with more specific flags, since these are processed later. + +# Check whether --with-version-string was given. +if test "${with_version_string+set}" = set; then : + withval=$with_version_string; fi - if test "x$with_build_number" = xyes; then - as_fn_error $? "Build number must have a value" "$LINENO" 5 - elif test "x$with_build_number" != x; then - JDK_BUILD_NUMBER="$with_build_number" + if test "x$with_version_string" = xyes; then + as_fn_error $? "--with-version-string must have a value" "$LINENO" 5 + elif test "x$with_version_string" != x; then + # Additional [] needed to keep m4 from mangling shell constructs. + if [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?(\.([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ; then + VERSION_MAJOR=${BASH_REMATCH[1]} + VERSION_MINOR=${BASH_REMATCH[3]} + VERSION_SECURITY=${BASH_REMATCH[5]} + VERSION_PATCH=${BASH_REMATCH[7]} + VERSION_PRE_BASE=${BASH_REMATCH[9]} + VERSION_PRE_DEBUGLEVEL=${BASH_REMATCH[11]} + version_plus_separator=${BASH_REMATCH[13]} + VERSION_BUILD=${BASH_REMATCH[14]} + VERSION_OPT=${BASH_REMATCH[16]} + # Unspecified numerical fields are interpreted as 0. + if test "x$VERSION_MINOR" = x; then + VERSION_MINOR=0 + fi + if test "x$VERSION_SECURITY" = x; then + VERSION_SECURITY=0 + fi + if test "x$VERSION_PATCH" = x; then + VERSION_PATCH=0 + fi + if test "x$version_plus_separator" != x && test "x$VERSION_BUILD$VERSION_OPT" = x; then + as_fn_error $? "Version string contains + but both 'BUILD' and 'OPT' are missing" "$LINENO" 5 + fi + # Stop the version part process from setting default values. + # We still allow them to explicitely override though. + NO_DEFAULT_VERSION_PARTS=true + else + as_fn_error $? "--with-version-string fails to parse as a valid version string: $with_version_string" "$LINENO" 5 + fi fi - # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set - if test "x$JDK_BUILD_NUMBER" = x; then - JDK_BUILD_NUMBER=b00 - if test "x$USER_RELEASE_SUFFIX" = x; then - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` - # Avoid [:alnum:] since it depends on the locale. - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + + +# Check whether --with-version-pre-base was given. +if test "${with_version_pre_base+set}" = set; then : + withval=$with_version_pre_base; with_version_pre_base_present=true +else + with_version_pre_base_present=false +fi + + + if test "x$with_version_pre_base_present" = xtrue; then + if test "x$with_version_pre_base" = xyes; then + as_fn_error $? "--with-version-pre-base must have a value" "$LINENO" 5 + elif test "x$with_version_pre_base" = xno; then + # Interpret --without-* as empty string instead of the literal "no" + VERSION_PRE_BASE= + else + # Only [a-zA-Z] is allowed in the VERSION_PRE. Outer [ ] to quote m4. + VERSION_PRE_BASE=`$ECHO "$with_version_pre_base" | $TR -c -d '[a-z][A-Z]'` + if test "x$VERSION_PRE_BASE" != "x$with_version_pre_base"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-version-pre-base value has been sanitized from '$with_version_pre_base' to '$VERSION_PRE_BASE'" >&5 +$as_echo "$as_me: WARNING: --with-version-pre-base value has been sanitized from '$with_version_pre_base' to '$VERSION_PRE_BASE'" >&2;} + fi + fi + else + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is to use "internal" as pre + VERSION_PRE_BASE="internal" fi fi - # Now set the JDK version, milestone, build number etc. +# Check whether --with-version-pre-debuglevel was given. +if test "${with_version_pre_debuglevel+set}" = set; then : + withval=$with_version_pre_debuglevel; with_version_pre_debuglevel_present=true +else + with_version_pre_debuglevel_present=false +fi + if test "x$with_version_pre_debuglevel_present" = xtrue; then + if test "x$with_version_pre_debuglevel" = xyes; then + as_fn_error $? "--with-version-pre-debuglevel must have a value" "$LINENO" 5 + elif test "x$with_version_pre_debuglevel" = xno; then + # Interpret --without-* as empty string instead of the literal "no" + VERSION_PRE_DEBUGLEVEL= + else + # Only [a-zA-Z] is allowed in the VERSION_PRE. Outer [ ] to quote m4. + VERSION_PRE_DEBUGLEVEL=`$ECHO "$with_version_pre_debuglevel" | $TR -c -d '[a-z][A-Z]'` + if test "x$VERSION_PRE_DEBUGLEVEL" != "x$with_version_pre_debuglevel"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-version-pre-debuglevel value has been sanitized from '$with_version_pre_debuglevel' to '$VERSION_PRE_DEBUGLEVEL'" >&5 +$as_echo "$as_me: WARNING: --with-version-pre-debuglevel value has been sanitized from '$with_version_pre_debuglevel' to '$VERSION_PRE_DEBUGLEVEL'" >&2;} + fi + fi + else + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is to use the debug level name, except for release which is empty. + if test "x$DEBUG_LEVEL" != "xrelease"; then + VERSION_PRE_DEBUGLEVEL="$DEBUG_LEVEL" + else + VERSION_PRE_DEBUGLEVEL="" + fi + fi + fi +# Check whether --with-version-opt was given. +if test "${with_version_opt+set}" = set; then : + withval=$with_version_opt; with_version_opt_present=true +else + with_version_opt_present=false +fi + if test "x$with_version_opt_present" = xtrue; then + if test "x$with_version_opt" = xyes; then + as_fn_error $? "--with-version-opt must have a value" "$LINENO" 5 + elif test "x$with_version_opt" = xno; then + # Interpret --without-* as empty string instead of the literal "no" + VERSION_OPT= + else + # Only [-.a-zA-Z0-9] is allowed in the VERSION_OPT. Outer [ ] to quote m4. + VERSION_OPT=`$ECHO "$with_version_opt" | $TR -c -d '[a-z][A-Z][0-9].-'` + if test "x$VERSION_OPT" != "x$with_version_opt"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-version-opt value has been sanitized from '$with_version_opt' to '$VERSION_OPT'" >&5 +$as_echo "$as_me: WARNING: --with-version-opt value has been sanitized from '$with_version_opt' to '$VERSION_OPT'" >&2;} + fi + fi + else + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is to calculate a string like this .. + timestamp=`$DATE '+%Y-%m-%d-%H%M%S'` + # Outer [ ] to quote m4. + username=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` + basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'` + VERSION_OPT="$timestamp.$username.$basedirname" + fi + fi +# Check whether --with-version-build was given. +if test "${with_version_build+set}" = set; then : + withval=$with_version_build; with_version_build_present=true +else + with_version_build_present=false +fi + if test "x$with_version_build_present" = xtrue; then + if test "x$with_version_build" = xyes; then + as_fn_error $? "--with-version-build must have a value" "$LINENO" 5 + elif test "x$with_version_build" = xno; then + # Interpret --without-* as empty string instead of the literal "no" + VERSION_BUILD= + elif test "x$with_version_build" = x; then + VERSION_BUILD= + else + # Additional [] needed to keep m4 from mangling shell constructs. + if ! [[ "$with_version_build" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then + as_fn_error $? "\"$with_version_build\" is not a valid numerical value for VERSION_BUILD" "$LINENO" 5 + fi + # Extract the version number without leading zeros. + cleaned_value=${BASH_REMATCH[1]} + if test "x$cleaned_value" = x; then + # Special case for zero + cleaned_value=${BASH_REMATCH[2]} + fi + if test $cleaned_value -gt 255; then + as_fn_error $? "VERSION_BUILD is given as $with_version_build. This is greater than 255 which is not allowed." "$LINENO" 5 + fi + if test "x$cleaned_value" != "x$with_version_build"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_BUILD has been sanitized from '$with_version_build' to '$cleaned_value'" >&5 +$as_echo "$as_me: WARNING: Value for VERSION_BUILD has been sanitized from '$with_version_build' to '$cleaned_value'" >&2;} + fi + VERSION_BUILD=$cleaned_value + fi + else + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is to not have a build number. + VERSION_BUILD="" + # FIXME: Until all code can cope with an empty VERSION_BUILD, set it to 0. + VERSION_BUILD=0 + fi + fi -# Check whether --with-copyright-year was given. -if test "${with_copyright_year+set}" = set; then : - withval=$with_copyright_year; +# Check whether --with-version-major was given. +if test "${with_version_major+set}" = set; then : + withval=$with_version_major; with_version_major_present=true +else + with_version_major_present=false fi - if test "x$with_copyright_year" = xyes; then - as_fn_error $? "Copyright year must have a value" "$LINENO" 5 - elif test "x$with_copyright_year" != x; then - COPYRIGHT_YEAR="$with_copyright_year" + + if test "x$with_version_major_present" = xtrue; then + if test "x$with_version_major" = xyes; then + as_fn_error $? "--with-version-major must have a value" "$LINENO" 5 + else + + # Additional [] needed to keep m4 from mangling shell constructs. + if ! [[ "$with_version_major" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then + as_fn_error $? "\"$with_version_major\" is not a valid numerical value for VERSION_MAJOR" "$LINENO" 5 + fi + # Extract the version number without leading zeros. + cleaned_value=${BASH_REMATCH[1]} + if test "x$cleaned_value" = x; then + # Special case for zero + cleaned_value=${BASH_REMATCH[2]} + fi + + if test $cleaned_value -gt 255; then + as_fn_error $? "VERSION_MAJOR is given as $with_version_major. This is greater than 255 which is not allowed." "$LINENO" 5 + fi + if test "x$cleaned_value" != "x$with_version_major"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_MAJOR has been sanitized from '$with_version_major' to '$cleaned_value'" >&5 +$as_echo "$as_me: WARNING: Value for VERSION_MAJOR has been sanitized from '$with_version_major' to '$cleaned_value'" >&2;} + fi + VERSION_MAJOR=$cleaned_value + + fi else - COPYRIGHT_YEAR=`date +'%Y'` + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is to get value from version-numbers + VERSION_MAJOR="$DEFAULT_VERSION_MAJOR" + fi + fi + + +# Check whether --with-version-minor was given. +if test "${with_version_minor+set}" = set; then : + withval=$with_version_minor; with_version_minor_present=true +else + with_version_minor_present=false +fi + + + if test "x$with_version_minor_present" = xtrue; then + if test "x$with_version_minor" = xyes; then + as_fn_error $? "--with-version-minor must have a value" "$LINENO" 5 + elif test "x$with_version_minor" = xno; then + # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" + VERSION_MINOR=0 + elif test "x$with_version_minor" = x; then + VERSION_MINOR=0 + else + + # Additional [] needed to keep m4 from mangling shell constructs. + if ! [[ "$with_version_minor" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then + as_fn_error $? "\"$with_version_minor\" is not a valid numerical value for VERSION_MINOR" "$LINENO" 5 + fi + # Extract the version number without leading zeros. + cleaned_value=${BASH_REMATCH[1]} + if test "x$cleaned_value" = x; then + # Special case for zero + cleaned_value=${BASH_REMATCH[2]} fi + if test $cleaned_value -gt 255; then + as_fn_error $? "VERSION_MINOR is given as $with_version_minor. This is greater than 255 which is not allowed." "$LINENO" 5 + fi + if test "x$cleaned_value" != "x$with_version_minor"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_MINOR has been sanitized from '$with_version_minor' to '$cleaned_value'" >&5 +$as_echo "$as_me: WARNING: Value for VERSION_MINOR has been sanitized from '$with_version_minor' to '$cleaned_value'" >&2;} + fi + VERSION_MINOR=$cleaned_value - if test "x$JDK_UPDATE_VERSION" != x; then - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" + fi else - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is 0, if unspecified + VERSION_MINOR=0 + fi fi - COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` +# Check whether --with-version-security was given. +if test "${with_version_security+set}" = set; then : + withval=$with_version_security; with_version_security_present=true +else + with_version_security_present=false +fi + + + if test "x$with_version_security_present" = xtrue; then + if test "x$with_version_security" = xyes; then + as_fn_error $? "--with-version-security must have a value" "$LINENO" 5 + elif test "x$with_version_security" = xno; then + # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" + VERSION_SECURITY=0 + elif test "x$with_version_security" = x; then + VERSION_SECURITY=0 + else + + # Additional [] needed to keep m4 from mangling shell constructs. + if ! [[ "$with_version_security" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then + as_fn_error $? "\"$with_version_security\" is not a valid numerical value for VERSION_SECURITY" "$LINENO" 5 + fi + # Extract the version number without leading zeros. + cleaned_value=${BASH_REMATCH[1]} + if test "x$cleaned_value" = x; then + # Special case for zero + cleaned_value=${BASH_REMATCH[2]} + fi + + if test $cleaned_value -gt 255; then + as_fn_error $? "VERSION_SECURITY is given as $with_version_security. This is greater than 255 which is not allowed." "$LINENO" 5 + fi + if test "x$cleaned_value" != "x$with_version_security"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_SECURITY has been sanitized from '$with_version_security' to '$cleaned_value'" >&5 +$as_echo "$as_me: WARNING: Value for VERSION_SECURITY has been sanitized from '$with_version_security' to '$cleaned_value'" >&2;} + fi + VERSION_SECURITY=$cleaned_value + + fi + else + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is 0, if unspecified + VERSION_SECURITY=0 + fi + fi + + +# Check whether --with-version-patch was given. +if test "${with_version_patch+set}" = set; then : + withval=$with_version_patch; with_version_patch_present=true +else + with_version_patch_present=false +fi + + + if test "x$with_version_patch_present" = xtrue; then + if test "x$with_version_patch" = xyes; then + as_fn_error $? "--with-version-patch must have a value" "$LINENO" 5 + elif test "x$with_version_patch" = xno; then + # Interpret --without-* as empty string (i.e. 0) instead of the literal "no" + VERSION_PATCH=0 + elif test "x$with_version_patch" = x; then + VERSION_PATCH=0 + else + + # Additional [] needed to keep m4 from mangling shell constructs. + if ! [[ "$with_version_patch" =~ ^0*([1-9][0-9]*)|(0)$ ]] ; then + as_fn_error $? "\"$with_version_patch\" is not a valid numerical value for VERSION_PATCH" "$LINENO" 5 + fi + # Extract the version number without leading zeros. + cleaned_value=${BASH_REMATCH[1]} + if test "x$cleaned_value" = x; then + # Special case for zero + cleaned_value=${BASH_REMATCH[2]} + fi + + if test $cleaned_value -gt 255; then + as_fn_error $? "VERSION_PATCH is given as $with_version_patch. This is greater than 255 which is not allowed." "$LINENO" 5 + fi + if test "x$cleaned_value" != "x$with_version_patch"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Value for VERSION_PATCH has been sanitized from '$with_version_patch' to '$cleaned_value'" >&5 +$as_echo "$as_me: WARNING: Value for VERSION_PATCH has been sanitized from '$with_version_patch' to '$cleaned_value'" >&2;} + fi + VERSION_PATCH=$cleaned_value + + fi + else + if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then + # Default is 0, if unspecified + VERSION_PATCH=0 + fi + fi + + # Calculate derived version properties + + # Set pre to "pre-base" if debug level is empty (i.e. release), or + # "pre-base.debug-level" otherwise. + if test "x$VERSION_PRE_BASE" = x && test "x$VERSION_PRE_DEBUGLEVEL" != x; then + as_fn_error $? "Cannot set version-pre-debuglevel when version-pre-base is empty" "$LINENO" 5 + fi + VERSION_PRE=$VERSION_PRE_BASE${VERSION_PRE_DEBUGLEVEL:+.$VERSION_PRE_DEBUGLEVEL} + + # VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions. + VERSION_NUMBER_FOUR_POSITIONS=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_SECURITY.$VERSION_PATCH + + stripped_version_number=$VERSION_NUMBER_FOUR_POSITIONS + # Strip trailing zeroes from stripped_version_number + for i in 1 2 3 ; do stripped_version_number=${stripped_version_number%.0} ; done + VERSION_NUMBER=$stripped_version_number + + # The complete version string, with additional build information + if test "x$VERSION_BUILD$VERSION_OPT" = x; then + VERSION_STRING=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE} + else + # If either build or opt is set, we need a + separator + VERSION_STRING=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}+$VERSION_BUILD${VERSION_OPT:+-$VERSION_OPT} + fi + + # The short version string, just VERSION_NUMBER and PRE, if present. + VERSION_SHORT=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE} + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version string" >&5 +$as_echo_n "checking for version string... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION_STRING" >&5 +$as_echo "$VERSION_STRING" >&6; } + + + + + + + + + + + @@ -41065,13 +41505,13 @@ # The \$ are escaped to the shell, and the $(...) variables # are evaluated by make. RC_FLAGS="$RC_FLAGS \ - -D\"JDK_BUILD_ID=\$(FULL_VERSION)\" \ + -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \ -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=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \ -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_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_MAJOR)\" \ + -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\"" fi @@ -42148,10 +42588,6 @@ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG" fi - # Setup release name - COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'" - - # Set some additional per-OS defines. if test "x$OPENJDK_TARGET_OS" = xmacosx; then COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT" @@ -52159,18 +52595,18 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; } - if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then - ENABLE_INTREE_EC=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then + ENABLE_INTREE_EC=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else - ENABLE_INTREE_EC=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + else + ENABLE_INTREE_EC=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - fi + fi @@ -54273,6 +54709,7 @@ printf "* JDK variant: $JDK_VARIANT\n" printf "* JVM variants: $with_jvm_variants\n" printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n" + printf "* Version string: $VERSION_STRING ($VERSION_SHORT)\n" printf "\n" printf "Tools summary:\n" --- old/common/autoconf/help.m4 2015-06-10 15:43:39.099125883 +0200 +++ new/common/autoconf/help.m4 2015-06-10 15:43:38.983125881 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -202,6 +202,7 @@ printf "* JDK variant: $JDK_VARIANT\n" printf "* JVM variants: $with_jvm_variants\n" printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n" + printf "* Version string: $VERSION_STRING ($VERSION_SHORT)\n" printf "\n" printf "Tools summary:\n" --- old/common/autoconf/jdk-options.m4 2015-06-10 15:43:39.527125890 +0200 +++ new/common/autoconf/jdk-options.m4 2015-06-10 15:43:39.415125888 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -436,25 +436,6 @@ ############################################################################### # - # Enable or disable the elliptic curve crypto implementation - # - AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], - [ - AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) - - if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then - ENABLE_INTREE_EC=yes - AC_MSG_RESULT([yes]) - else - ENABLE_INTREE_EC=no - AC_MSG_RESULT([no]) - fi - - AC_SUBST(ENABLE_INTREE_EC) - ]) - - ############################################################################### - # # --enable-rmiconnector-iiop # AC_ARG_ENABLE(rmiconnector-iiop, [AS_HELP_STRING([--enable-rmiconnector-iiop], @@ -473,85 +454,8 @@ COMPRESS_JARS=false AC_SUBST(COMPRESS_JARS) -]) - -############################################################################### -# -# Setup version numbers -# -AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], -[ - # Source the version numbers - . $AUTOCONF_DIR/version-numbers - - # Get the settings from parameters - AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], - [Set milestone value for build @<:@internal@:>@])]) - if test "x$with_milestone" = xyes; then - AC_MSG_ERROR([Milestone must have a value]) - elif test "x$with_milestone" != x; then - MILESTONE="$with_milestone" - fi - if test "x$MILESTONE" = x; then - MILESTONE=internal - fi - - AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], - [Set update version value for build @<:@b00@:>@])]) - if test "x$with_update_version" = xyes; then - AC_MSG_ERROR([Update version must have a value]) - elif test "x$with_update_version" != x; then - JDK_UPDATE_VERSION="$with_update_version" - # On macosx 10.7, it's not possible to set --with-update-version=0X due - # to a bug in expr (which reduces it to just X). To work around this, we - # always add a 0 to one digit update versions. - if test "${#JDK_UPDATE_VERSION}" = "1"; then - JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" - fi - fi - - AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], - [Add a custom string to the version string if build number is not set.@<:@username_builddateb00@:>@])]) - if test "x$with_user_release_suffix" = xyes; then - AC_MSG_ERROR([Release suffix must have a value]) - elif test "x$with_user_release_suffix" != x; then - USER_RELEASE_SUFFIX="$with_user_release_suffix" - fi - - AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], - [Set build number value for build @<:@b00@:>@])]) - if test "x$with_build_number" = xyes; then - AC_MSG_ERROR([Build number must have a value]) - elif test "x$with_build_number" != x; then - JDK_BUILD_NUMBER="$with_build_number" - fi - # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set - if test "x$JDK_BUILD_NUMBER" = x; then - JDK_BUILD_NUMBER=b00 - if test "x$USER_RELEASE_SUFFIX" = x; then - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` - # Avoid [:alnum:] since it depends on the locale. - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - fi - fi - - # Now set the JDK version, milestone, build number etc. - AC_SUBST(USER_RELEASE_SUFFIX) - AC_SUBST(JDK_MAJOR_VERSION) - AC_SUBST(JDK_MINOR_VERSION) - AC_SUBST(JDK_MICRO_VERSION) - AC_SUBST(JDK_UPDATE_VERSION) - AC_SUBST(JDK_BUILD_NUMBER) - AC_SUBST(MILESTONE) - AC_SUBST(LAUNCHER_NAME) - AC_SUBST(PRODUCT_NAME) - AC_SUBST(PRODUCT_SUFFIX) - AC_SUBST(JDK_RC_PLATFORM_NAME) - AC_SUBST(COMPANY_NAME) - AC_SUBST(MACOSX_BUNDLE_NAME_BASE) - AC_SUBST(MACOSX_BUNDLE_ID_BASE) + # Setup default copyright year. Mostly overridden when building close to a new year. AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], [Set copyright year value for build @<:@current year@:>@])]) if test "x$with_copyright_year" = xyes; then @@ -562,16 +466,6 @@ COPYRIGHT_YEAR=`date +'%Y'` fi AC_SUBST(COPYRIGHT_YEAR) - - if test "x$JDK_UPDATE_VERSION" != x; then - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" - else - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" - fi - AC_SUBST(JDK_VERSION) - - COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` - AC_SUBST(COOKED_BUILD_NUMBER) ]) AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS], @@ -587,6 +481,26 @@ AC_SUBST(SALIB_NAME) ]) +############################################################################### +# +# Enable or disable the elliptic curve crypto implementation +# +AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], +[ + AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) + + if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then + ENABLE_INTREE_EC=yes + AC_MSG_RESULT([yes]) + else + ENABLE_INTREE_EC=no + AC_MSG_RESULT([no]) + fi + + AC_SUBST(ENABLE_INTREE_EC) +]) + + AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS], [ # --- old/common/autoconf/spec.gmk.in 2015-06-10 15:43:39.967125897 +0200 +++ new/common/autoconf/spec.gmk.in 2015-06-10 15:43:39.851125895 +0200 @@ -148,13 +148,50 @@ NASHORN_TOPDIR:=@NASHORN_TOPDIR@ COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@ -# Information gathered from the version.numbers file. -JDK_MAJOR_VERSION:=@JDK_MAJOR_VERSION@ -JDK_MINOR_VERSION:=@JDK_MINOR_VERSION@ -JDK_MICRO_VERSION:=@JDK_MICRO_VERSION@ -JDK_UPDATE_VERSION:=@JDK_UPDATE_VERSION@ -JDK_BUILD_NUMBER:=@JDK_BUILD_NUMBER@ -MILESTONE:=@MILESTONE@ +# New (JEP-223) version information + +## Building blocks of the version string +# First three version numbers, with well-specified meanings (numerical) +VERSION_MAJOR := @VERSION_MAJOR@ +VERSION_MINOR := @VERSION_MINOR@ +VERSION_SECURITY := @VERSION_SECURITY@ +# Optional fourth element for use by OpenJDK consumers (numerical) +VERSION_PATCH := @VERSION_PATCH@ +# The pre-release identifier (string) +VERSION_PRE := @VERSION_PRE@ +# The build number (numerical) +VERSION_BUILD := @VERSION_BUILD@ +# Optional build information (string) +VERSION_OPT := @VERSION_OPT@ + +## Composite variables +# The version number as a dot separated sequence of numbers, e.g. 9.0.1 +VERSION_NUMBER := @VERSION_NUMBER@ +# VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions. +VERSION_NUMBER_FOUR_POSITIONS := @VERSION_NUMBER_FOUR_POSITIONS@ +# The complete version string, with additional build information +VERSION_STRING := @VERSION_STRING@ +# The short version string, without trailing zeroes and just PRE, if present. +VERSION_SHORT := @VERSION_SHORT@ +# The Java specification version. It should be equal to version number. +VERSION_SPECIFICATION := @VERSION_NUMBER@ + +# Convenience CFLAGS settings for passing version information into native programs. +VERSION_CFLAGS := \ + -DVERSION_MAJOR=$(VERSION_MAJOR) \ + -DVERSION_MINOR=$(VERSION_MINOR) \ + -DVERSION_SECURITY=$(VERSION_SECURITY) \ + -DVERSION_PATCH=$(VERSION_PATCH) \ + -DVERSION_PRE='"$(VERSION_PRE)"' \ + -DVERSION_BUILD=$(VERSION_BUILD) \ + -DVERSION_OPT='"$(VERSION_OPT)"' \ + -DVERSION_NUMBER='"$(VERSION_NUMBER)"' \ + -DVERSION_STRING='"$(VERSION_STRING)"' \ + -DVERSION_SHORT='"$(VERSION_SHORT)"' \ + -DVERSION_SPECIFICATION='"$(VERSION_SPECIFICATION)"' \ + # + +# Platform naming variables LAUNCHER_NAME:=@LAUNCHER_NAME@ PRODUCT_NAME:=@PRODUCT_NAME@ PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@ @@ -162,27 +199,9 @@ COMPANY_NAME:=@COMPANY_NAME@ MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@ MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@ -USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ -# Different version strings generated from the above information. -JDK_VERSION:=@JDK_VERSION@ +# Different naming strings generated from the above information. RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) -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. -ifeq ($(MILESTONE), fcs) - RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) -else - RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) -endif - -ifneq ($(USER_RELEASE_SUFFIX), ) - FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER) -else - FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER) -endif -JRE_RELEASE_VERSION:=$(FULL_VERSION) -JDK_VERSION_FOR_MANIFEST := $(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(if $(JDK_UPDATE_VERSION),$(JDK_UPDATE_VERSION),0).$(COOKED_BUILD_NUMBER) # How to compile the code: release, fastdebug or slowdebug DEBUG_LEVEL:=@DEBUG_LEVEL@ @@ -688,8 +707,8 @@ SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR) # Macosx bundles directory definitions -JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle/jdk$(JDK_VERSION).jdk/Contents -JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle/jre$(JDK_VERSION).jre/Contents +JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle/jdk$(VERSION_NUMBER).jdk/Contents +JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle/jre$(VERSION_NUMBER).jre/Contents JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR) JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR) --- old/common/autoconf/version-numbers 2015-06-10 15:43:40.399125903 +0200 +++ new/common/autoconf/version-numbers 2015-06-10 15:43:40.291125902 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,10 +23,10 @@ # questions. # -JDK_MAJOR_VERSION=1 -JDK_MINOR_VERSION=9 -JDK_MICRO_VERSION=0 -JDK_UPDATE_VERSION= +# Default version numbers to use unless overridden by configure + +DEFAULT_VERSION_MAJOR=9 + LAUNCHER_NAME=openjdk PRODUCT_NAME=OpenJDK PRODUCT_SUFFIX="Runtime Environment" --- old/common/nb_native/nbproject/configurations.xml 2015-06-10 15:43:40.831125910 +0200 +++ new/common/nb_native/nbproject/configurations.xml 2015-06-10 15:43:40.707125908 +0200 @@ -1911,15 +1911,9 @@ IDE_ALT_BOOTDIR - FULL_VERSION="version" HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_RELEASE_VERSION="version" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" - JRE_RELEASE_VERSION="version" @@ -4534,7 +4528,6 @@ flavor2="0"> - JRE_RELEASE_VERSION="version" @@ -4857,15 +4850,12 @@ AMD64 ARCH="amd64" - FULL_VERSION="version" GAMMA HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_LIB_ARCH="amd64" HOTSPOT_RELEASE_VERSION="version" HOTSPOT_VM_DISTRO="OpenJDK" - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_TYPE="gamma" LINK_INTO_LIBJVM PRODUCT @@ -5346,10 +5336,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -5399,10 +5385,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Finalizer.c" @@ -5429,10 +5411,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Array.c" @@ -5488,10 +5466,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Bits.c" @@ -5525,10 +5499,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="AccessController.c" @@ -5569,10 +5539,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -6141,10 +6107,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" LINUX NDEBUG RELEASE="" @@ -6198,10 +6160,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" LINUX NDEBUG RELEASE="" @@ -6577,10 +6535,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jdk_util_md.c" @@ -6623,10 +6577,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -6652,10 +6602,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ProcessEnvironment_md.c" @@ -6711,10 +6657,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="FileSystemPreferences.c" @@ -7037,10 +6979,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="HostLocaleProviderAdapter_md.c" @@ -7135,15 +7073,9 @@ IDE_ALT_BOOTDIR - FULL_VERSION="version" HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_RELEASE_VERSION="version" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" - JRE_RELEASE_VERSION="version" @@ -9822,7 +9754,6 @@ flavor2="0"> - JRE_RELEASE_VERSION="version" @@ -10483,10 +10414,7 @@ EXPAND_CLASSPATH_WILDCARDS - FULL_VERSION="version" JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", } - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_NAME="openjdk" NEVER_ACT_AS_SERVER_CLASS_MACHINE PROGNAME="javac" @@ -11349,10 +11277,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="check_version.c" @@ -11382,10 +11306,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jdk_util.c" @@ -11415,10 +11335,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jio.c" @@ -11448,10 +11364,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jni_util.c" @@ -11481,10 +11393,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="verify_stub.c" @@ -11569,10 +11477,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Class.c" @@ -11602,10 +11506,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ClassLoader.c" @@ -11635,10 +11535,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Compiler.c" @@ -11668,10 +11564,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Double.c" @@ -11701,10 +11593,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Float.c" @@ -11734,10 +11622,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Object.c" @@ -11767,10 +11651,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Package.c" @@ -11800,10 +11680,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ResourceBundle.c" @@ -11833,10 +11709,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Runtime.c" @@ -11866,10 +11738,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="SecurityManager.c" @@ -11899,10 +11767,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Shutdown.c" @@ -11932,10 +11796,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="StrictMath.c" @@ -11965,10 +11825,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="String.c" @@ -11998,10 +11854,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="System.c" @@ -12031,10 +11883,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Thread.c" @@ -12064,10 +11912,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Throwable.c" @@ -12804,10 +12648,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="TimeZone.c" @@ -20853,15 +20693,12 @@ AMD64 ARCH="amd64" - FULL_VERSION="version" GAMMA HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_LIB_ARCH="amd64" HOTSPOT_RELEASE_VERSION="version" HOTSPOT_VM_DISTRO="OpenJDK" - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_TYPE="gamma" LINK_INTO_LIBJVM LINUX @@ -20919,15 +20756,12 @@ AMD64 ARCH="amd64" - FULL_VERSION="version" GAMMA HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_LIB_ARCH="amd64" HOTSPOT_RELEASE_VERSION="version" HOTSPOT_VM_DISTRO="OpenJDK" - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_TYPE="gamma" LINK_INTO_LIBJVM LINUX @@ -21824,10 +21658,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -21877,10 +21707,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Finalizer.c" @@ -21907,10 +21733,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Array.c" @@ -21966,10 +21788,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Bits.c" @@ -22003,10 +21821,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="AccessController.c" @@ -22047,10 +21861,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -22619,10 +22429,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" LINUX NDEBUG RELEASE="" @@ -22676,10 +22482,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" LINUX NDEBUG RELEASE="" @@ -23055,10 +22857,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jdk_util_md.c" @@ -23101,10 +22899,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -23130,10 +22924,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ProcessEnvironment_md.c" @@ -23189,10 +22979,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="FileSystemPreferences.c" @@ -23515,10 +23301,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="HostLocaleProviderAdapter_md.c" @@ -23613,15 +23395,9 @@ IDE_ALT_BOOTDIR - FULL_VERSION="version" HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_RELEASE_VERSION="version" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" - JRE_RELEASE_VERSION="version" @@ -27454,7 +27230,6 @@ flavor2="0"> - JRE_RELEASE_VERSION="version" @@ -28130,11 +27905,8 @@ EXPAND_CLASSPATH_WILDCARDS - FULL_VERSION="version" HAVE_GETHRTIME JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", } - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_NAME="openjdk" NEVER_ACT_AS_SERVER_CLASS_MACHINE PROGNAME="javac" @@ -28961,10 +28733,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="check_version.c" @@ -28994,10 +28762,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jdk_util.c" @@ -29027,10 +28791,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jio.c" @@ -29060,10 +28820,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="jni_util.c" @@ -29093,10 +28849,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="verify_stub.c" @@ -29181,10 +28933,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Class.c" @@ -29214,10 +28962,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ClassLoader.c" @@ -29247,10 +28991,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Compiler.c" @@ -29280,10 +29020,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Double.c" @@ -29313,10 +29049,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Float.c" @@ -29346,10 +29078,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Object.c" @@ -29379,10 +29107,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Package.c" @@ -29412,10 +29136,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ResourceBundle.c" @@ -29445,10 +29165,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Runtime.c" @@ -29478,10 +29194,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="SecurityManager.c" @@ -29511,10 +29223,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Shutdown.c" @@ -29544,10 +29252,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="StrictMath.c" @@ -29577,10 +29281,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="String.c" @@ -29610,10 +29310,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="System.c" @@ -29643,10 +29339,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Thread.c" @@ -29676,10 +29368,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Throwable.c" @@ -30416,10 +30104,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="TimeZone.c" @@ -38550,15 +38234,12 @@ AMD64 ARCH="amd64" - FULL_VERSION="version" GAMMA HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_LIB_ARCH="amd64" HOTSPOT_RELEASE_VERSION="version" HOTSPOT_VM_DISTRO="OpenJDK" - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_TYPE="gamma" LINK_INTO_LIBJVM PRODUCT @@ -38723,15 +38404,12 @@ AMD64 ARCH="amd64" - FULL_VERSION="version" GAMMA HOTSPOT_BUILD_TARGET="target" HOTSPOT_BUILD_USER="user" HOTSPOT_LIB_ARCH="amd64" HOTSPOT_RELEASE_VERSION="version" HOTSPOT_VM_DISTRO="OpenJDK" - JDK_MAJOR_VERSION="version" - JDK_MINOR_VERSION="minor" LAUNCHER_TYPE="gamma" LINK_INTO_LIBJVM PRODUCT @@ -39575,10 +39253,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -39628,10 +39302,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Finalizer.c" @@ -39658,10 +39328,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Array.c" @@ -39717,10 +39383,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="Bits.c" @@ -39754,10 +39416,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="AccessController.c" @@ -39798,10 +39456,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -40381,10 +40035,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" BREAKPTS - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" MACRO_MEMSYS_OPS NDEBUG RELEASE="" @@ -40441,10 +40091,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" BREAKPTS - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" MACRO_MEMSYS_OPS NDEBUG RELEASE="" @@ -40916,10 +40562,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" BREAKPTS - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" MACRO_MEMSYS_OPS NDEBUG RELEASE="" @@ -40986,10 +40628,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" @@ -41015,10 +40653,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="ProcessEnvironment_md.c" @@ -41074,10 +40708,6 @@ ARCHPROPNAME="amd64" - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" THIS_FILE="FileSystemPreferences.c" @@ -41528,10 +41158,6 @@ ARCH="amd64" ARCHPROPNAME="amd64" BREAKPTS - JDK_BUILD_NUMBER="nn" - JDK_MAJOR_VERSION="version" - JDK_MICRO_VERSION="version" - JDK_MINOR_VERSION="minor" MACRO_MEMSYS_OPS NDEBUG RELEASE="" --- old/make/Images.gmk 2015-06-10 15:43:41.887125927 +0200 +++ new/make/Images.gmk 2015-06-10 15:43:41.771125925 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -363,13 +363,14 @@ # Param 1 - The file containing the MODULES list define create-info-file - $(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)") + $(call info-file-item, "JAVA_VERSION", "$(VERSION_NUMBER)") + $(call info-file-item, "JAVA_FULL_VERSION", "$(VERSION_STRING)") $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)") $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)") $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)") $(if $(JDK_ARCH_ABI_PROP_NAME), \ $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) - $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)") + $(call info-file-item, "SOURCE", "$(strip $(ALL_SOURCE_TIPS))") $(call info-file-item, "MODULES", "`$(CAT) $1`") endef --- old/make/Install.gmk 2015-06-10 15:43:42.335125934 +0200 +++ new/make/Install.gmk 2015-06-10 15:43:42.223125932 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ include $(SPEC) BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*)) -INSTALLDIR := openjdk-$(RELEASE) +INSTALLDIR := openjdk-$(VERSION_SHORT) # Install the jdk image, in a very crude way. Not taking into # account, how to install properly on macosx or windows etc. --- old/make/Javadoc.gmk 2015-06-10 15:43:42.775125941 +0200 +++ new/make/Javadoc.gmk 2015-06-10 15:43:42.659125939 +0200 @@ -49,8 +49,6 @@ HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs -BUILD_NUMBER=$(JDK_BUILD_NUMBER) - JAVADOC_CMD = $(JAVA) \ -Djava.awt.headless=true \ $(NEW_JAVADOC) @@ -122,11 +120,8 @@ BUG_SUBMIT_LINE = Submit a bug or feature # Url to devdocs page -# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html -DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html -DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html -DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION)) -DOCS_BASE_URL = http://download.oracle.com/javase/7/docs +DOCS_BASE_URL = http://docs.oracle.com/javase/$(VERSION_SPECIFICATION)/docs +DEV_DOCS_URL = $(DOCS_BASE_URL)/index.html # Common Java trademark line JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \ @@ -313,14 +308,13 @@ -# Draft used for non-fcs documents -DRAFT_HEADER = -ifneq ($(MILESTONE), fcs) - DRAFT_HEADER =
DRAFT $(MILESTONE)-$(BUILD_NUMBER) - DRAFT_BOTTOM =
DRAFT $(MILESTONE)-$(BUILD_NUMBER) - DRAFT_WINTITLE = $(BUILD_NUMBER) +# Assume we need a draft format whenever the pre-release identifier is non-empty +ifneq ($(VERSION_PRE),) + DRAFT_HEADER :=
DRAFT $(VERSION_STRING) + DRAFT_BOTTOM :=
DRAFT $(VERSION_STRING) + DRAFT_WINTITLE := $(VERSION_BUILD) # Early access top text (not used in FCS releases) - COREAPI_TOP_EARLYACCESS = \ + COREAPI_TOP_EARLYACCESS := \
\
API Specification -COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION) +$(VERSION_SPECIFICATION)
API Specification +COREAPI_WINDOWTITLE = Java Platform SE $(VERSION_SPECIFICATION) COREAPI_HEADER = \ -Java$(TRADEMARK) Platform
Standard Ed. $(JDK_MINOR_VERSION) +Java$(TRADEMARK) Platform
Standard Ed. $(VERSION_SPECIFICATION) # Overview file for core apis COREAPI_OVERVIEW = $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.html @@ -1337,55 +1311,9 @@ $(prep-target) $(call PackageFilter,$(JDKNET_PKGS)) -############################################################# -#release version of core packages ######## - -# The rel-coredocs and rel-docs targets were added by Eric Armstrong. rel-coredocs -# assumes the kind of large, 32-bit machine used in the javapubs group's docs-release -# process. It specifies memory settings accordingly to maximize performance. -# -# The performance settings, like the sanity check, are most important for the core -# docs--the platform APIs. Running javadoc on those APIs takes a significant amount -# of time and memory. Setting the initial heap size as large as possible is important -# to prevent thrashing as the heap grows. Setting the maximum as large as necessary -# is also important to keep the job from failing. -# -# -J-Xmx512 sets a maximum of 512, which became necessary in 6.0 -# -J-Xms256 sets starting size to 256 (default is 8) -# -# rel-coredocs also includes a sanity check to help ensure that BUILD_NUMBER and -# MILESTONE are specified properly when docs are built outside of the normal release -# engineering process, with the intention of releasing them on the web or in a downloaded -# docs bundle. (When invoked in release engineering's control build, the values are always -# set properly. But when the targets are run by themselves, they default to b00 and -# "internal"--which silently sabotage the result of a build that can take many hours -# to complete. - -# Maximize performance and ensure that build number & milestone are set. - -rel-coredocs: sanitycheckcoredocs - $(MAKE) coredocs - -rel-docs: rel-coredocs $(ALL_OTHER_TARGETS) -# -# end of production targets otherdocs: $(ALL_OTHER_TARGETS) -clean: - $(RM) -r $(DOCSDIR) $(DOCSTMPDIR) - -############################################################# -# DEBUG TARGET -# List the values defined in the makefile hierarchy, to make sure everything -# is set properly, and to help identify values we can use instead of making new ones. -# (Most of them come from common/shared/Defs.gmk) -# -# Notes: -# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER= -# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line -# - ############################################################# -.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \ - sanitycheckcoredocs $(ALL_OTHER_TARGETS) +.PHONY: all docs coredocs otherdocs \ + $(ALL_OTHER_TARGETS) --- old/make/JrtfsJar.gmk 2015-06-10 15:43:43.207125948 +0200 +++ new/make/JrtfsJar.gmk 2015-06-10 15:43:43.095125946 +0200 @@ -35,7 +35,8 @@ SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \ OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \ REPLACEMENTS := \ - @@RELEASE@@ => $(RELEASE) ; \ + @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \ + @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \ @@COMPANY_NAME@@ => $(COMPANY_NAME) , \ )) --- old/make/MacBundles.gmk 2015-06-10 15:43:43.623125955 +0200 +++ new/make/MacBundles.gmk 2015-06-10 15:43:43.511125953 +0200 @@ -37,11 +37,11 @@ MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle - BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION) - BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION) - BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION) - BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION) - BUNDLE_VERSION := $(JDK_VERSION) + BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT) + BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT) + BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_STRING) + BUNDLE_PLATFORM_VERSION := $(VERSION_MAJOR).$(VERSION_MINOR) + BUNDLE_VERSION := $(VERSION_NUMBER) ifeq ($(COMPANY_NAME), N/A) BUNDLE_VENDOR := UNDEFINED else --- old/make/jprt.properties 2015-06-10 15:43:44.059125962 +0200 +++ new/make/jprt.properties 2015-06-10 15:43:43.951125960 +0200 @@ -93,6 +93,7 @@ --with-output-sync=recurse \ --with-boot-jdk=$ALT_BOOTDIR \ --with-jobs=$ALT_PARALLEL_COMPILE_JOBS \ + --with-version-opt=$JPRT_JOB_ID \ ${my.additional.build.configure.args.${jprt.test.set}} \ ${my.custom.build.configure.args} --- old/hotspot/make/Makefile 2015-06-10 15:43:44.511125969 +0200 +++ new/hotspot/make/Makefile 2015-06-10 15:43:44.379125967 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -48,17 +48,13 @@ # Set ALT_BUILD_WIN_SA=1 to enable building SA on # Windows. # Version strings and numbers: -# JDK_VERSION Current JDK version (e.g. 1.6.0) -# PREVIOUS_JDK_VERSION Previous (bootdir) JDK version (e.g. 1.5.0) -# FULL_VERSION Full version string to use (e.g. "1.6.0-ea-b42") -# -# Version strings and numbers especially needed on Windows: -# COOKED_JDK_UPDATE_VERSION Just the update release number (e.g. 02) -# COOKED_BUILD_NUMBER Just the build number (e.g. 42) -# JDK_MKTG_VERSION Marketing JDK version (e.g. 6.0) -# JDK_MAJOR_VERSION Major number for version (e.g. 1) always 1? -# JDK_MINOR_VERSION Minor number for version (e.g. 6) -# JDK_MICRO_VERSION Micro number for version (e.g. 0) +# VERSION_SHORT Current JDK version (e.g. 9.0.0) +# JDK_PREVIOUS_VERSION Previous (bootdir) JDK version (e.g. 1.5.0) (Only needed +# to facilitate standalone build.) +# VERSION_STRING Full version string to use (e.g. "9.0.0-ea-b42") +# VERSION_MAJOR Major number for version (e.g. 9) +# VERSION_MINOR Minor number for version (e.g. 0) +# VERSION_SECURITY Security number for version (e.g. 0) # # Default is build both product fastdebug and create export area @@ -853,9 +849,9 @@ @$(ECHO) \ " $(MAKE) world" @$(ECHO) \ -" $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" +" $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(JDK_PREVIOUS_VERSION)" @$(ECHO) \ -" $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)" +" $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(VERSION_STRING)" # Universal build support ifeq ($(OS_VENDOR), Darwin) --- old/hotspot/make/aix/Makefile 2015-06-10 15:43:44.983125976 +0200 +++ new/hotspot/make/aix/Makefile 2015-06-10 15:43:44.847125974 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright 2012, 2013 SAP AG. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -210,7 +210,7 @@ BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) --- old/hotspot/make/aix/makefiles/buildtree.make 2015-06-10 15:43:45.447125984 +0200 +++ new/hotspot/make/aix/makefiles/buildtree.make 2015-06-10 15:43:45.311125982 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright 2012, 2013 SAP AG. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -37,9 +37,8 @@ # GAMMADIR - top of workspace # OS_FAMILY - operating system # VARIANT - core, compiler1, compiler2, or tiered -# HOTSPOT_RELEASE_VERSION - ..[-][-][-b] -# HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty -# JRE_RELEASE_VERSION - .. (1.7.0) +# VERSION_STRING - the JDK version string as specified by JEP-223 +# HOTSPOT_VERSION_STRING - the same as VERSION_STRING, unless overridden by a standalone build # # Builds the directory trees with makefiles plus some convenience files in # each directory: @@ -132,11 +131,7 @@ # Define variables to be set in flags.make. # Default values are set in make/defs.make. -ifeq ($(HOTSPOT_BUILD_VERSION),) - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) -else - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) -endif + # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami) ifndef HOTSPOT_BUILD_USER HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME) @@ -161,7 +156,7 @@ endif endif -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE = \ $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) @@ -210,9 +205,9 @@ echo "BUILDARCH = $(BUILDARCH)"; \ echo "LIBARCH = $(LIBARCH)"; \ echo "TARGET = $(TARGET)"; \ - echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ - echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ - echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ + echo "HOTSPOT_VERSION_STRING = $(HOTSPOT_VERSION_STRING)"; \ + echo "VERSION_STRING = $(VERSION_STRING)"; \ + echo "SA_BUILD_VERSION = $(HOTSPOT_VERSION_STRING)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ echo "OPENJDK = $(OPENJDK)"; \ --- old/hotspot/make/aix/makefiles/defs.make 2015-06-10 15:43:45.915125991 +0200 +++ new/hotspot/make/aix/makefiles/defs.make 2015-06-10 15:43:45.779125989 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright 2012, 2013 SAP AG. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -79,102 +79,85 @@ endif endif -# determine if HotSpot is being built in JDK6 or earlier version -JDK6_OR_EARLIER=0 -ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" - # if the longer variable names (newer build style) are set, then check those - ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" - JDK6_OR_EARLIER=1 - endif -else - # the longer variables aren't set so check the shorter variable names - ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" - JDK6_OR_EARLIER=1 +# The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product +# builds is enabled with debug info files ZIP'ed to save space. For +# BUILD_FLAVOR != product builds, FDS is always enabled, after all a +# debug build without debug info isn't very useful. +# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. +# +# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be +# disabled for a BUILD_FLAVOR == product build. +# +# Note: Use of a different variable name for the FDS override option +# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS +# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass +# in options via environment variables, use of distinct variables +# prevents strange behaviours. For example, in a BUILD_FLAVOR != +# product build, the FULL_DEBUG_SYMBOLS environment variable will be +# 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If +# the same variable name is used, then different values can be picked +# up by different parts of the build. Just to be clear, we only need +# two variable names because the incoming option value can be +# overridden in some situations, e.g., a BUILD_FLAVOR != product +# build. + +# Due to the multiple sub-make processes that occur this logic gets +# executed multiple times. We reduce the noise by at least checking that +# BUILD_FLAVOR has been set. +ifneq ($(BUILD_FLAVOR),) + ifeq ($(BUILD_FLAVOR), product) + FULL_DEBUG_SYMBOLS ?= 1 + ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + else + # debug variants always get Full Debug Symbols (if available) + ENABLE_FULL_DEBUG_SYMBOLS = 1 endif -endif + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later -ifeq ($(JDK6_OR_EARLIER),0) - # Full Debug Symbols is supported on JDK7 or newer. - # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product - # builds is enabled with debug info files ZIP'ed to save space. For - # BUILD_FLAVOR != product builds, FDS is always enabled, after all a - # debug build without debug info isn't very useful. - # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. - # - # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be - # disabled for a BUILD_FLAVOR == product build. - # - # Note: Use of a different variable name for the FDS override option - # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS - # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass - # in options via environment variables, use of distinct variables - # prevents strange behaviours. For example, in a BUILD_FLAVOR != - # product build, the FULL_DEBUG_SYMBOLS environment variable will be - # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If - # the same variable name is used, then different values can be picked - # up by different parts of the build. Just to be clear, we only need - # two variable names because the incoming option value can be - # overridden in some situations, e.g., a BUILD_FLAVOR != product - # build. - - # Due to the multiple sub-make processes that occur this logic gets - # executed multiple times. We reduce the noise by at least checking that - # BUILD_FLAVOR has been set. - ifneq ($(BUILD_FLAVOR),) - ifeq ($(BUILD_FLAVOR), product) - FULL_DEBUG_SYMBOLS ?= 1 - ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + # Default OBJCOPY comes from GNU Binutils on Linux + ifeq ($(CROSS_COMPILE_ARCH),) + DEF_OBJCOPY=/usr/bin/objcopy else - # debug variants always get Full Debug Symbols (if available) - ENABLE_FULL_DEBUG_SYMBOLS = 1 + # Assume objcopy is part of the cross-compilation toolset + ifneq ($(ALT_COMPILER_PATH),) + DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy + endif + endif + OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) + ifneq ($(ALT_OBJCOPY),) + $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) + OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - # Default OBJCOPY comes from GNU Binutils on Linux - ifeq ($(CROSS_COMPILE_ARCH),) - DEF_OBJCOPY=/usr/bin/objcopy - else - # Assume objcopy is part of the cross-compilation toolset - ifneq ($(ALT_COMPILER_PATH),) - DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy - endif - endif - OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) - ifneq ($(ALT_OBJCOPY),) - $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) - OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) - endif + ifeq ($(OBJCOPY),) + $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")) + ENABLE_FULL_DEBUG_SYMBOLS=0 + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + else + $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) - ifeq ($(OBJCOPY),) - $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")) - ENABLE_FULL_DEBUG_SYMBOLS=0 - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - else - $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) - - # Library stripping policies for .debuginfo configs: - # all_strip - strips everything from the library - # min_strip - strips most stuff from the library; leaves minimum symbols - # no_strip - does not strip the library at all - # - # Oracle security policy requires "all_strip". A waiver was granted on - # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. - # - # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. - # - STRIP_POLICY ?= min_strip + # Library stripping policies for .debuginfo configs: + # all_strip - strips everything from the library + # min_strip - strips most stuff from the library; leaves minimum symbols + # no_strip - does not strip the library at all + # + # Oracle security policy requires "all_strip". A waiver was granted on + # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. + # + # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. + # + STRIP_POLICY ?= min_strip - $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) + $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) - ZIP_DEBUGINFO_FILES ?= 1 + ZIP_DEBUGINFO_FILES ?= 1 - $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) - endif - endif # ENABLE_FULL_DEBUG_SYMBOLS=1 - endif # BUILD_FLAVOR -endif # JDK_6_OR_EARLIER + $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) + endif + endif # ENABLE_FULL_DEBUG_SYMBOLS=1 +endif # BUILD_FLAVOR # unused JDK_INCLUDE_SUBDIR=aix --- old/hotspot/make/aix/makefiles/vm.make 2015-06-10 15:43:46.387125999 +0200 +++ new/hotspot/make/aix/makefiles/vm.make 2015-06-10 15:43:46.255125997 +0200 @@ -74,12 +74,12 @@ endif # The following variables are defined in the generated flags.make file. -JDK_VER_DEFS = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \ - -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \ - -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \ - -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\"" -VM_VER_DEFS = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \ - -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\"" \ +JDK_VER_DEFS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ + -DVERSION_MINOR=$(VERSION_MINOR) \ + -DVERSION_SECURITY=$(VERSION_SECURITY) \ + -DVERSION_BUILD=$(VERSION_BUILD) +VM_VER_DEFS = -DHOTSPOT_VERSION_STRING="\"$(HOTSPOT_VERSION_STRING)\"" \ + -DVERSION_STRING="\"$(VERSION_STRING)\"" \ $(JDK_VER_DEFS) HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" --- old/hotspot/make/bsd/Makefile 2015-06-10 15:43:46.843126006 +0200 +++ new/hotspot/make/bsd/Makefile 2015-06-10 15:43:46.711126004 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -203,7 +203,7 @@ BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX) -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) --- old/hotspot/make/bsd/makefiles/buildtree.make 2015-06-10 15:43:47.307126013 +0200 +++ new/hotspot/make/bsd/makefiles/buildtree.make 2015-06-10 15:43:47.175126011 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -36,9 +36,8 @@ # GAMMADIR - top of workspace # OS_FAMILY - operating system # VARIANT - core, compiler1, compiler2, or tiered -# HOTSPOT_RELEASE_VERSION - ..[-][-][-b] -# HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty -# JRE_RELEASE_VERSION - .. (1.7.0) +# VERSION_STRING - the JDK version string as specified by JEP-223 +# HOTSPOT_VERSION_STRING - the same as VERSION_STRING, unless overridden by a standalone build # # Builds the directory trees with makefiles plus some convenience files in # each directory: @@ -137,11 +136,7 @@ # Define variables to be set in flags.make. # Default values are set in make/defs.make. -ifeq ($(HOTSPOT_BUILD_VERSION),) - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) -else - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) -endif + # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami) ifndef HOTSPOT_BUILD_USER HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME) @@ -166,7 +161,7 @@ endif endif -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE = \ $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) @@ -216,9 +211,9 @@ echo "BUILDARCH = $(BUILDARCH)"; \ echo "LIBARCH = $(LIBARCH)"; \ echo "TARGET = $(TARGET)"; \ - echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ - echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ - echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ + echo "HOTSPOT_VERSION_STRING = $(HOTSPOT_VERSION_STRING)"; \ + echo "VERSION_STRING = $(VERSION_STRING)"; \ + echo "SA_BUILD_VERSION = $(HOTSPOT_VERSION_STRING)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ echo "OPENJDK = $(OPENJDK)"; \ --- old/hotspot/make/bsd/makefiles/defs.make 2015-06-10 15:43:47.787126021 +0200 +++ new/hotspot/make/bsd/makefiles/defs.make 2015-06-10 15:43:47.643126019 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -144,114 +144,97 @@ OS_VENDOR:=$(shell uname -s) -# determine if HotSpot is being built in JDK6 or earlier version -JDK6_OR_EARLIER=0 -ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" - # if the longer variable names (newer build style) are set, then check those - ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" - JDK6_OR_EARLIER=1 - endif -else - # the longer variables aren't set so check the shorter variable names - ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" - JDK6_OR_EARLIER=1 +# The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product +# builds is enabled with debug info files ZIP'ed to save space. For +# BUILD_FLAVOR != product builds, FDS is always enabled, after all a +# debug build without debug info isn't very useful. +# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. +# +# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be +# disabled for a BUILD_FLAVOR == product build. +# +# Note: Use of a different variable name for the FDS override option +# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS +# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass +# in options via environment variables, use of distinct variables +# prevents strange behaviours. For example, in a BUILD_FLAVOR != +# product build, the FULL_DEBUG_SYMBOLS environment variable will be +# 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If +# the same variable name is used, then different values can be picked +# up by different parts of the build. Just to be clear, we only need +# two variable names because the incoming option value can be +# overridden in some situations, e.g., a BUILD_FLAVOR != product +# build. + +# Due to the multiple sub-make processes that occur this logic gets +# executed multiple times. We reduce the noise by at least checking that +# BUILD_FLAVOR has been set. +ifneq ($(BUILD_FLAVOR),) + ifeq ($(BUILD_FLAVOR), product) + FULL_DEBUG_SYMBOLS ?= 1 + ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + else + # debug variants always get Full Debug Symbols (if available) + ENABLE_FULL_DEBUG_SYMBOLS = 1 endif -endif + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later -ifeq ($(JDK6_OR_EARLIER),0) - # Full Debug Symbols is supported on JDK7 or newer. - # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product - # builds is enabled with debug info files ZIP'ed to save space. For - # BUILD_FLAVOR != product builds, FDS is always enabled, after all a - # debug build without debug info isn't very useful. - # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. - # - # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be - # disabled for a BUILD_FLAVOR == product build. - # - # Note: Use of a different variable name for the FDS override option - # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS - # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass - # in options via environment variables, use of distinct variables - # prevents strange behaviours. For example, in a BUILD_FLAVOR != - # product build, the FULL_DEBUG_SYMBOLS environment variable will be - # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If - # the same variable name is used, then different values can be picked - # up by different parts of the build. Just to be clear, we only need - # two variable names because the incoming option value can be - # overridden in some situations, e.g., a BUILD_FLAVOR != product - # build. - - # Due to the multiple sub-make processes that occur this logic gets - # executed multiple times. We reduce the noise by at least checking that - # BUILD_FLAVOR has been set. - ifneq ($(BUILD_FLAVOR),) - ifeq ($(BUILD_FLAVOR), product) - FULL_DEBUG_SYMBOLS ?= 1 - ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(OS_VENDOR), Darwin) + # MacOS X doesn't use OBJCOPY or STRIP_POLICY + OBJCOPY= + STRIP_POLICY= + ZIP_DEBUGINFO_FILES ?= 1 else - # debug variants always get Full Debug Symbols (if available) - ENABLE_FULL_DEBUG_SYMBOLS = 1 - endif - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - ifeq ($(OS_VENDOR), Darwin) - # MacOS X doesn't use OBJCOPY or STRIP_POLICY - OBJCOPY= - STRIP_POLICY= - ZIP_DEBUGINFO_FILES ?= 1 + # Default OBJCOPY comes from GNU Binutils on BSD + ifeq ($(CROSS_COMPILE_ARCH),) + DEF_OBJCOPY=/usr/bin/objcopy else - # Default OBJCOPY comes from GNU Binutils on BSD - ifeq ($(CROSS_COMPILE_ARCH),) - DEF_OBJCOPY=/usr/bin/objcopy - else - # Assume objcopy is part of the cross-compilation toolset - ifneq ($(ALT_COMPILER_PATH),) - DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy - endif - endif - OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) - ifneq ($(ALT_OBJCOPY),) - $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) - OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) + # Assume objcopy is part of the cross-compilation toolset + ifneq ($(ALT_COMPILER_PATH),) + DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy endif + endif + OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) + ifneq ($(ALT_OBJCOPY),) + $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) + OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) + endif - ifeq ($(OBJCOPY),) - $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo" \ - "files. You may need to set ALT_OBJCOPY.")) - ENABLE_FULL_DEBUG_SYMBOLS=0 - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - else - $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo" \ - "files.")) - - # Library stripping policies for .debuginfo configs: - # all_strip - strips everything from the library - # min_strip - strips most stuff from the library; leaves - # minimum symbols - # no_strip - does not strip the library at all - # - # Oracle security policy requires "all_strip". A waiver was - # granted on 2011.09.01 that permits using "min_strip" in the - # Java JDK and Java JRE. - # - # Currently, STRIP_POLICY is only used when Full Debug Symbols - # is enabled. - # - STRIP_POLICY ?= min_strip + ifeq ($(OBJCOPY),) + $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo" \ + "files. You may need to set ALT_OBJCOPY.")) + ENABLE_FULL_DEBUG_SYMBOLS=0 + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + else + $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo" \ + "files.")) - $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) + # Library stripping policies for .debuginfo configs: + # all_strip - strips everything from the library + # min_strip - strips most stuff from the library; leaves + # minimum symbols + # no_strip - does not strip the library at all + # + # Oracle security policy requires "all_strip". A waiver was + # granted on 2011.09.01 that permits using "min_strip" in the + # Java JDK and Java JRE. + # + # Currently, STRIP_POLICY is only used when Full Debug Symbols + # is enabled. + # + STRIP_POLICY ?= min_strip - ZIP_DEBUGINFO_FILES ?= 1 - endif + $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) - $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) + ZIP_DEBUGINFO_FILES ?= 1 endif - endif # ENABLE_FULL_DEBUG_SYMBOLS=1 - endif # BUILD_FLAVOR -endif # JDK_6_OR_EARLIER + + $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) + endif + endif # ENABLE_FULL_DEBUG_SYMBOLS=1 +endif # BUILD_FLAVOR JDK_INCLUDE_SUBDIR=bsd --- old/hotspot/make/bsd/makefiles/vm.make 2015-06-10 15:43:48.271126029 +0200 +++ new/hotspot/make/bsd/makefiles/vm.make 2015-06-10 15:43:48.127126026 +0200 @@ -73,12 +73,12 @@ endif # The following variables are defined in the generated flags.make file. -JDK_VER_DEFS = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \ - -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \ - -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \ - -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\"" -VM_VER_DEFS = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \ - -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\"" \ +JDK_VER_DEFS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ + -DVERSION_MINOR=$(VERSION_MINOR) \ + -DVERSION_SECURITY=$(VERSION_SECURITY) \ + -DVERSION_BUILD=$(VERSION_BUILD) +VM_VER_DEFS = -DHOTSPOT_VERSION_STRING="\"$(HOTSPOT_VERSION_STRING)\"" \ + -DVERSION_STRING="\"$(VERSION_STRING)\"" \ $(JDK_VER_DEFS) HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" --- old/hotspot/make/defs.make 2015-06-10 15:43:48.735126036 +0200 +++ new/hotspot/make/defs.make 2015-06-10 15:43:48.595126034 +0200 @@ -122,58 +122,49 @@ # hotspot version definitions include $(GAMMADIR)/make/jdk_version -# Java versions needed -ifeq ($(PREVIOUS_JDK_VERSION),) - PREVIOUS_JDK_VERSION=$(JDK_PREVIOUS_VERSION) -endif -ifeq ($(JDK_MAJOR_VERSION),) - JDK_MAJOR_VERSION=$(JDK_MAJOR_VER) +# JDK_PREVIOUS_VERSION is only needed to facilitate standalone builds +ifeq ($(JDK_PREVIOUS_VERSION),) + JDK_PREVIOUS_VERSION=$(STANDALONE_JDK_PREVIOUS_VERSION) endif -ifeq ($(JDK_MINOR_VERSION),) - JDK_MINOR_VERSION=$(JDK_MINOR_VER) +# Java versions needed +ifeq ($(VERSION_MAJOR),) + VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER) endif -ifeq ($(JDK_MICRO_VERSION),) - JDK_MICRO_VERSION=$(JDK_MICRO_VER) +ifeq ($(VERSION_MINOR),) + VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER) endif -ifeq ($(JDK_BUILD_NUMBER),) - JDK_BUILD_NUMBER=0 +ifeq ($(VERSION_SECURITY),) + VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER) endif -ifeq ($(JDK_MKTG_VERSION),) - JDK_MKTG_VERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) +ifeq ($(VERSION_PATCH),) + VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER) endif -ifeq ($(JDK_VERSION),) - ifeq ($(BUILD_FLAVOR), product) - JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION) - else - JDK_VERSION=$(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)-$(BUILD_FLAVOR) - endif +ifeq ($(VERSION_BUILD),) + VERSION_BUILD=0 endif -ifeq ($(FULL_VERSION),) - FULL_VERSION="$(JDK_VERSION)" +ifeq ($(VERSION_SHORT),) + VERSION_SHORT=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY) endif - -# FULL_VERSION is only used to define JRE_RELEASE_VERSION which is used -# as JRE version in VM -Xinternalversion output. -ifndef JRE_RELEASE_VERSION - JRE_RELEASE_VERSION=$(FULL_VERSION) +ifeq ($(VERSION_STRING),) + # Note that this is an extremely rough and incorrect approximation of a correct version string. + VERSION_STRING=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_SECURITY)-internal endif -ifndef HOTSPOT_RELEASE_VERSION - HOTSPOT_RELEASE_VERSION=$(FULL_VERSION) +ifneq ($(HOTSPOT_RELEASE_VERSION),) + # Allow old command-line overrides + HOTSPOT_VERSION_STRING := $(HOTSPOT_RELEASE_VERSION) +else + # Normally get from surrounding JDK build + HOTSPOT_VERSION_STRING := $(VERSION_STRING) endif -ifdef HOTSPOT_BUILD_VERSION -# specified in command line +ifneq ($(HOTSPOT_BUILD_VERSION),) + # If old command-lines variable exists, append to version string + HOTSPOT_VERSION_STRING := $(HOTSPOT_VERSION_STRING)-$(HOTSPOT_BUILD_VERSION) else - ifdef COOKED_BUILD_NUMBER -# JRE build - HOTSPOT_BUILD_VERSION= - else - ifdef USER_RELEASE_SUFFIX - HOTSPOT_BUILD_VERSION=internal-$(USER_RELEASE_SUFFIX) - else - HOTSPOT_BUILD_VERSION=internal - endif + ifeq ($(SPEC),) + # If building standalone, add -internal. + HOTSPOT_VERSION_STRING := $(HOTSPOT_VERSION_STRING)-internal endif endif @@ -233,7 +224,7 @@ endif # Find latest promoted JDK area -JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(JDK_VERSION)/promoted/latest/binaries/$(PLATFORM) +JDK_IMPORT_PATH=$(SLASH_JAVA)/re/j2se/$(VERSION_STRING)/promoted/latest/binaries/$(PLATFORM) ifneq ($(ALT_JDK_IMPORT_PATH),) JDK_IMPORT_PATH=$(ALT_JDK_IMPORT_PATH) endif @@ -246,7 +237,7 @@ endif # Find JDK used for javac compiles -BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) +BOOTDIR=$(SLASH_JAVA)/re/j2se/$(JDK_PREVIOUS_VERSION)/latest/binaries/$(PLATFORM) ifneq ($(ALT_BOOTDIR),) BOOTDIR=$(ALT_BOOTDIR) endif @@ -337,12 +328,7 @@ MAKE_ARGS += OUTPUTDIR=$(ABS_OUTPUTDIR) MAKE_ARGS += GAMMADIR=$(ABS_GAMMADIR) MAKE_ARGS += MAKE_VERBOSE=$(MAKE_VERBOSE) -MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) - -# Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile -# to overwrite the default definition since OS specific Makefile also -# includes this make/defs.make file. -MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) +MAKE_ARGS += VERSION_STRING=$(VERSION_STRING) MAKE_ARGS += BOOT_JDK_SOURCETARGET="$(BOOT_JDK_SOURCETARGET)" --- old/hotspot/make/jdk_version 2015-06-10 15:43:49.207126044 +0200 +++ new/hotspot/make/jdk_version 2015-06-10 15:43:49.067126041 +0200 @@ -1,5 +1,5 @@ -# -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,11 +26,12 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2014 +HOTSPOT_VM_COPYRIGHT=Copyright 2015 -JDK_MAJOR_VER=1 -JDK_MINOR_VER=9 -JDK_MICRO_VER=0 +STANDALONE_JDK_MAJOR_VER=9 +STANDALONE_JDK_MINOR_VER=0 +STANDALONE_JDK_SECURITY_VER=0 +STANDALONE_JDK_PATCH_VER=0 # Previous (bootdir) JDK version -JDK_PREVIOUS_VERSION=1.8.0 +STANDALONE_JDK_PREVIOUS_VERSION=1.8.0 --- old/hotspot/make/linux/Makefile 2015-06-10 15:43:49.679126051 +0200 +++ new/hotspot/make/linux/Makefile 2015-06-10 15:43:49.535126049 +0200 @@ -210,7 +210,7 @@ BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) --- old/hotspot/make/linux/makefiles/buildtree.make 2015-06-10 15:43:50.139126058 +0200 +++ new/hotspot/make/linux/makefiles/buildtree.make 2015-06-10 15:43:50.003126056 +0200 @@ -36,9 +36,8 @@ # GAMMADIR - top of workspace # OS_FAMILY - operating system # VARIANT - core, compiler1, compiler2, or tiered -# HOTSPOT_RELEASE_VERSION - ..[-][-][-b] -# HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty -# JRE_RELEASE_VERSION - .. (1.7.0) +# VERSION_STRING - the JDK version string as specified by JEP-223 +# HOTSPOT_VERSION_STRING - the same as VERSION_STRING, unless overridden by a standalone build # # Builds the directory trees with makefiles plus some convenience files in # each directory: @@ -133,11 +132,7 @@ # Define variables to be set in flags.make. # Default values are set in make/defs.make. -ifeq ($(HOTSPOT_BUILD_VERSION),) - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) -else - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) -endif + # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami) ifndef HOTSPOT_BUILD_USER HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME) @@ -162,7 +157,7 @@ endif endif -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE = \ $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) @@ -216,9 +211,9 @@ echo "BUILDARCH = $(BUILDARCH)"; \ echo "LIBARCH = $(LIBARCH)"; \ echo "TARGET = $(TARGET)"; \ - echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ - echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ - echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ + echo "HOTSPOT_VERSION_STRING = $(HOTSPOT_VERSION_STRING)"; \ + echo "VERSION_STRING = $(VERSION_STRING)"; \ + echo "SA_BUILD_VERSION = $(HOTSPOT_VERSION_STRING)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ echo "OPENJDK = $(OPENJDK)"; \ --- old/hotspot/make/linux/makefiles/defs.make 2015-06-10 15:43:50.599126066 +0200 +++ new/hotspot/make/linux/makefiles/defs.make 2015-06-10 15:43:50.467126064 +0200 @@ -139,102 +139,85 @@ endif endif -# determine if HotSpot is being built in JDK6 or earlier version -JDK6_OR_EARLIER=0 -ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" - # if the longer variable names (newer build style) are set, then check those - ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" - JDK6_OR_EARLIER=1 +# The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product +# builds is enabled with debug info files ZIP'ed to save space. For +# BUILD_FLAVOR != product builds, FDS is always enabled, after all a +# debug build without debug info isn't very useful. +# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. +# +# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be +# disabled for a BUILD_FLAVOR == product build. +# +# Note: Use of a different variable name for the FDS override option +# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS +# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass +# in options via environment variables, use of distinct variables +# prevents strange behaviours. For example, in a BUILD_FLAVOR != +# product build, the FULL_DEBUG_SYMBOLS environment variable will be +# 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If +# the same variable name is used, then different values can be picked +# up by different parts of the build. Just to be clear, we only need +# two variable names because the incoming option value can be +# overridden in some situations, e.g., a BUILD_FLAVOR != product +# build. + +# Due to the multiple sub-make processes that occur this logic gets +# executed multiple times. We reduce the noise by at least checking that +# BUILD_FLAVOR has been set. +ifneq ($(BUILD_FLAVOR),) + ifeq ($(BUILD_FLAVOR), product) + FULL_DEBUG_SYMBOLS ?= 1 + ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + else + # debug variants always get Full Debug Symbols (if available) + ENABLE_FULL_DEBUG_SYMBOLS = 1 endif -else - # the longer variables aren't set so check the shorter variable names - ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" - JDK6_OR_EARLIER=1 - endif -endif + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later -ifeq ($(JDK6_OR_EARLIER),0) - # Full Debug Symbols is supported on JDK7 or newer. - # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product - # builds is enabled with debug info files ZIP'ed to save space. For - # BUILD_FLAVOR != product builds, FDS is always enabled, after all a - # debug build without debug info isn't very useful. - # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. - # - # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be - # disabled for a BUILD_FLAVOR == product build. - # - # Note: Use of a different variable name for the FDS override option - # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS - # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass - # in options via environment variables, use of distinct variables - # prevents strange behaviours. For example, in a BUILD_FLAVOR != - # product build, the FULL_DEBUG_SYMBOLS environment variable will be - # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If - # the same variable name is used, then different values can be picked - # up by different parts of the build. Just to be clear, we only need - # two variable names because the incoming option value can be - # overridden in some situations, e.g., a BUILD_FLAVOR != product - # build. - - # Due to the multiple sub-make processes that occur this logic gets - # executed multiple times. We reduce the noise by at least checking that - # BUILD_FLAVOR has been set. - ifneq ($(BUILD_FLAVOR),) - ifeq ($(BUILD_FLAVOR), product) - FULL_DEBUG_SYMBOLS ?= 1 - ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + # Default OBJCOPY comes from GNU Binutils on Linux + ifeq ($(CROSS_COMPILE_ARCH),) + DEF_OBJCOPY=/usr/bin/objcopy else - # debug variants always get Full Debug Symbols (if available) - ENABLE_FULL_DEBUG_SYMBOLS = 1 + # Assume objcopy is part of the cross-compilation toolset + ifneq ($(ALT_COMPILER_PATH),) + DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy + endif + endif + OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) + ifneq ($(ALT_OBJCOPY),) + $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) + OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - # Default OBJCOPY comes from GNU Binutils on Linux - ifeq ($(CROSS_COMPILE_ARCH),) - DEF_OBJCOPY=/usr/bin/objcopy - else - # Assume objcopy is part of the cross-compilation toolset - ifneq ($(ALT_COMPILER_PATH),) - DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy - endif - endif - OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) - ifneq ($(ALT_OBJCOPY),) - $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) - OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) - endif + ifeq ($(OBJCOPY),) + $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")) + ENABLE_FULL_DEBUG_SYMBOLS=0 + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + else + $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) - ifeq ($(OBJCOPY),) - $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")) - ENABLE_FULL_DEBUG_SYMBOLS=0 - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - else - $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) - - # Library stripping policies for .debuginfo configs: - # all_strip - strips everything from the library - # min_strip - strips most stuff from the library; leaves minimum symbols - # no_strip - does not strip the library at all - # - # Oracle security policy requires "all_strip". A waiver was granted on - # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. - # - # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. - # - STRIP_POLICY ?= min_strip + # Library stripping policies for .debuginfo configs: + # all_strip - strips everything from the library + # min_strip - strips most stuff from the library; leaves minimum symbols + # no_strip - does not strip the library at all + # + # Oracle security policy requires "all_strip". A waiver was granted on + # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. + # + # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. + # + STRIP_POLICY ?= min_strip - $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) + $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) - ZIP_DEBUGINFO_FILES ?= 1 + ZIP_DEBUGINFO_FILES ?= 1 - $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) - endif - endif # ENABLE_FULL_DEBUG_SYMBOLS=1 - endif # BUILD_FLAVOR -endif # JDK_6_OR_EARLIER + $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) + endif + endif # ENABLE_FULL_DEBUG_SYMBOLS=1 +endif # BUILD_FLAVOR JDK_INCLUDE_SUBDIR=linux --- old/hotspot/make/linux/makefiles/vm.make 2015-06-10 15:43:51.055126073 +0200 +++ new/hotspot/make/linux/makefiles/vm.make 2015-06-10 15:43:50.923126071 +0200 @@ -75,12 +75,12 @@ endif # The following variables are defined in the generated flags.make file. -JDK_VER_DEFS = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \ - -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \ - -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \ - -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\"" -VM_VER_DEFS = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \ - -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\"" \ +JDK_VER_DEFS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ + -DVERSION_MINOR=$(VERSION_MINOR) \ + -DVERSION_SECURITY=$(VERSION_SECURITY) \ + -DVERSION_BUILD=$(VERSION_BUILD) +VM_VER_DEFS = -DHOTSPOT_VERSION_STRING="\"$(HOTSPOT_VERSION_STRING)\"" \ + -DVERSION_STRING="\"$(VERSION_STRING)\"" \ $(JDK_VER_DEFS) HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" --- old/hotspot/make/solaris/Makefile 2015-06-10 15:43:51.523126080 +0200 +++ new/hotspot/make/solaris/Makefile 2015-06-10 15:43:51.387126078 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -157,7 +157,7 @@ BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) --- old/hotspot/make/solaris/makefiles/buildtree.make 2015-06-10 15:43:51.991126088 +0200 +++ new/hotspot/make/solaris/makefiles/buildtree.make 2015-06-10 15:43:51.859126086 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -36,9 +36,8 @@ # GAMMADIR - top of workspace # OS_FAMILY - operating system # VARIANT - core, compiler1, compiler2, or tiered -# HOTSPOT_RELEASE_VERSION - ..[-][-][-b] -# HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty -# JRE_RELEASE_VERSION - .. (1.7.0) +# VERSION_STRING - the JDK version string as specified by JEP-223 +# HOTSPOT_VERSION_STRING - the same as VERSION_STRING, unless overridden by a standalone build # # Builds the directory trees with makefiles plus some convenience files in # each directory: @@ -124,11 +123,7 @@ # Define variables to be set in flags.make. # Default values are set in make/defs.make. -ifeq ($(HOTSPOT_BUILD_VERSION),) - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) -else - HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) -endif + # Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami) ifndef HOTSPOT_BUILD_USER HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME) @@ -153,7 +148,7 @@ endif endif -BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +BUILDTREE_VARS += HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) VERSION_STRING=$(VERSION_STRING) BUILDTREE = \ $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS) @@ -203,9 +198,9 @@ echo "BUILDARCH = $(BUILDARCH)"; \ echo "LIBARCH = $(LIBARCH)"; \ echo "TARGET = $(TARGET)"; \ - echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \ - echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \ - echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ + echo "HOTSPOT_VERSION_STRING = $(HOTSPOT_VERSION_STRING)"; \ + echo "VERSION_STRING = $(VERSION_STRING)"; \ + echo "SA_BUILD_VERSION = $(HOTSPOT_VERSION_STRING)"; \ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ echo "OPENJDK = $(OPENJDK)"; \ --- old/hotspot/make/solaris/makefiles/defs.make 2015-06-10 15:43:52.451126095 +0200 +++ new/hotspot/make/solaris/makefiles/defs.make 2015-06-10 15:43:52.319126093 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -77,144 +77,127 @@ endif endif -# determine if HotSpot is being built in JDK6 or earlier version -JDK6_OR_EARLIER=0 -ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" - # if the longer variable names (newer build style) are set, then check those - ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" - JDK6_OR_EARLIER=1 - endif -else - # the longer variables aren't set so check the shorter variable names - ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" - JDK6_OR_EARLIER=1 +# The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product +# builds is enabled with debug info files ZIP'ed to save space. For +# BUILD_FLAVOR != product builds, FDS is always enabled, after all a +# debug build without debug info isn't very useful. +# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. +# +# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be +# disabled for a BUILD_FLAVOR == product build. +# +# Note: Use of a different variable name for the FDS override option +# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS +# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass +# in options via environment variables, use of distinct variables +# prevents strange behaviours. For example, in a BUILD_FLAVOR != +# product build, the FULL_DEBUG_SYMBOLS environment variable will be +# 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If +# the same variable name is used, then different values can be picked +# up by different parts of the build. Just to be clear, we only need +# two variable names because the incoming option value can be +# overridden in some situations, e.g., a BUILD_FLAVOR != product +# build. + +# Due to the multiple sub-make processes that occur this logic gets +# executed multiple times. We reduce the noise by at least checking that +# BUILD_FLAVOR has been set. +ifneq ($(BUILD_FLAVOR),) + ifeq ($(BUILD_FLAVOR), product) + FULL_DEBUG_SYMBOLS ?= 1 + ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) + else + # debug variants always get Full Debug Symbols (if available) + ENABLE_FULL_DEBUG_SYMBOLS = 1 endif -endif + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later -ifeq ($(JDK6_OR_EARLIER),0) - # Full Debug Symbols is supported on JDK7 or newer. - # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product - # builds is enabled with debug info files ZIP'ed to save space. For - # BUILD_FLAVOR != product builds, FDS is always enabled, after all a - # debug build without debug info isn't very useful. - # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. - # - # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be - # disabled for a BUILD_FLAVOR == product build. - # - # Note: Use of a different variable name for the FDS override option - # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS - # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass - # in options via environment variables, use of distinct variables - # prevents strange behaviours. For example, in a BUILD_FLAVOR != - # product build, the FULL_DEBUG_SYMBOLS environment variable will be - # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If - # the same variable name is used, then different values can be picked - # up by different parts of the build. Just to be clear, we only need - # two variable names because the incoming option value can be - # overridden in some situations, e.g., a BUILD_FLAVOR != product - # build. - - # Due to the multiple sub-make processes that occur this logic gets - # executed multiple times. We reduce the noise by at least checking that - # BUILD_FLAVOR has been set. - ifneq ($(BUILD_FLAVOR),) - ifeq ($(BUILD_FLAVOR), product) - FULL_DEBUG_SYMBOLS ?= 1 - ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) - else - # debug variants always get Full Debug Symbols (if available) - ENABLE_FULL_DEBUG_SYMBOLS = 1 + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + # Default OBJCOPY comes from the SUNWbinutils package: + DEF_OBJCOPY=/usr/sfw/bin/gobjcopy + OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) + ifneq ($(ALT_OBJCOPY),) + $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) + OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later - - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - # Default OBJCOPY comes from the SUNWbinutils package: - DEF_OBJCOPY=/usr/sfw/bin/gobjcopy - OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) - ifneq ($(ALT_OBJCOPY),) - $(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)")) - OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) - endif - ifneq ($(OBJCOPY),) - # OBJCOPY version check: - # - version number is last blank separate word on first line - # - version number formats that have been seen: - # - . - # - .. - # - # Full Debug Symbols on Solaris needs version 2.21.1 or newer. - # - OBJCOPY_VERS_CHK := $(shell \ - $(OBJCOPY) --version \ - | sed -n \ - -e 's/.* //' \ - -e '/^[01]\./b bad' \ - -e '/^2\./{' \ - -e ' s/^2\.//' \ - -e ' /^[0-9]$$/b bad' \ - -e ' /^[0-9]\./b bad' \ - -e ' /^1[0-9]$$/b bad' \ - -e ' /^1[0-9]\./b bad' \ - -e ' /^20\./b bad' \ - -e ' /^21\.0$$/b bad' \ - -e ' /^21\.0\./b bad' \ - -e '}' \ - -e ':good' \ - -e 's/.*/VALID_VERSION/p' \ - -e 'q' \ - -e ':bad' \ - -e 's/.*/BAD_VERSION/p' \ - -e 'q' \ + ifneq ($(OBJCOPY),) + # OBJCOPY version check: + # - version number is last blank separate word on first line + # - version number formats that have been seen: + # - . + # - .. + # + # Full Debug Symbols on Solaris needs version 2.21.1 or newer. + # + OBJCOPY_VERS_CHK := $(shell \ + $(OBJCOPY) --version \ + | sed -n \ + -e 's/.* //' \ + -e '/^[01]\./b bad' \ + -e '/^2\./{' \ + -e ' s/^2\.//' \ + -e ' /^[0-9]$$/b bad' \ + -e ' /^[0-9]\./b bad' \ + -e ' /^1[0-9]$$/b bad' \ + -e ' /^1[0-9]\./b bad' \ + -e ' /^20\./b bad' \ + -e ' /^21\.0$$/b bad' \ + -e ' /^21\.0\./b bad' \ + -e '}' \ + -e ':good' \ + -e 's/.*/VALID_VERSION/p' \ + -e 'q' \ + -e ':bad' \ + -e 's/.*/BAD_VERSION/p' \ + -e 'q' \ + ) + ifeq ($(OBJCOPY_VERS_CHK),BAD_VERSION) + _JUNK_ := $(shell \ + echo >&2 "WARNING: $(OBJCOPY) --version info:"; \ + $(OBJCOPY) --version | sed -n -e 's/^/WARNING: /p' -e 'q' >&2; \ + echo >&2 "WARNING: an objcopy version of 2.21.1 or newer" \ + "is needed to create valid .debuginfo files."; \ + echo >&2 "WARNING: ignoring above objcopy command."; \ + echo >&2 "WARNING: patch 149063-01 or newer contains the" \ + "correct Solaris 10 SPARC version."; \ + echo >&2 "WARNING: patch 149064-01 or newer contains the" \ + "correct Solaris 10 X86 version."; \ + echo >&2 "WARNING: Solaris 11 Update 1 contains the" \ + "correct version."; \ ) - ifeq ($(OBJCOPY_VERS_CHK),BAD_VERSION) - _JUNK_ := $(shell \ - echo >&2 "WARNING: $(OBJCOPY) --version info:"; \ - $(OBJCOPY) --version | sed -n -e 's/^/WARNING: /p' -e 'q' >&2; \ - echo >&2 "WARNING: an objcopy version of 2.21.1 or newer" \ - "is needed to create valid .debuginfo files."; \ - echo >&2 "WARNING: ignoring above objcopy command."; \ - echo >&2 "WARNING: patch 149063-01 or newer contains the" \ - "correct Solaris 10 SPARC version."; \ - echo >&2 "WARNING: patch 149064-01 or newer contains the" \ - "correct Solaris 10 X86 version."; \ - echo >&2 "WARNING: Solaris 11 Update 1 contains the" \ - "correct version."; \ - ) - OBJCOPY= - endif + OBJCOPY= endif + endif + + ifeq ($(OBJCOPY),) + $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files.")) + ENABLE_FULL_DEBUG_SYMBOLS=0 + $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) + else + $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) - ifeq ($(OBJCOPY),) - $(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files.")) - ENABLE_FULL_DEBUG_SYMBOLS=0 - $(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")) - else - $(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files.")) - - # Library stripping policies for .debuginfo configs: - # all_strip - strips everything from the library - # min_strip - strips most stuff from the library; leaves minimum symbols - # no_strip - does not strip the library at all - # - # Oracle security policy requires "all_strip". A waiver was granted on - # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. - # - # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. - # - STRIP_POLICY ?= min_strip + # Library stripping policies for .debuginfo configs: + # all_strip - strips everything from the library + # min_strip - strips most stuff from the library; leaves minimum symbols + # no_strip - does not strip the library at all + # + # Oracle security policy requires "all_strip". A waiver was granted on + # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. + # + # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. + # + STRIP_POLICY ?= min_strip - $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) + $(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)")) - ZIP_DEBUGINFO_FILES ?= 1 + ZIP_DEBUGINFO_FILES ?= 1 - $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) - endif - endif # ENABLE_FULL_DEBUG_SYMBOLS=1 - endif # BUILD_FLAVOR -endif # JDK_6_OR_EARLIER + $(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")) + endif + endif # ENABLE_FULL_DEBUG_SYMBOLS=1 +endif # BUILD_FLAVOR JDK_INCLUDE_SUBDIR=solaris --- old/hotspot/make/solaris/makefiles/sparcWorks.make 2015-06-10 15:43:52.939126103 +0200 +++ new/hotspot/make/solaris/makefiles/sparcWorks.make 2015-06-10 15:43:52.799126101 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -# +# # # If a SPEC is not set already, then use these defaults. @@ -39,7 +39,7 @@ STRIP = /usr/ccs/bin/strip endif -# Check for the versions of C++ and C compilers ($CXX and $CC) used. +# Check for the versions of C++ and C compilers ($CXX and $CC) used. # Get the last thing on the line that looks like x.x+ (x is a digit). COMPILER_REV := \ @@ -48,15 +48,9 @@ $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') # Pick which compiler is validated -ifeq ($(JRE_RELEASE_VER),1.6.0) - # Validated compiler for JDK6 is SS11 (5.8) - VALIDATED_COMPILER_REVS := 5.8 - VALIDATED_CC_COMPILER_REVS := 5.8 -else - # Validated compiler for JDK9 is SS12.3 (5.12) - VALIDATED_COMPILER_REVS := 5.12 - VALIDATED_CC_COMPILER_REVS := 5.12 -endif +# Validated compiler for JDK9 is SS12.3 (5.12) +VALIDATED_COMPILER_REVS := 5.12 +VALIDATED_CC_COMPILER_REVS := 5.12 # Warning messages about not using the above validated versions ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS}) @@ -237,7 +231,7 @@ CFLAGS/NOEX=-features=no%except -# avoid compilation problems arising from fact that C++ compiler tries +# avoid compilation problems arising from fact that C++ compiler tries # to search for external template definition by just compiling additional # source files in th same context CFLAGS += -template=no%extdef @@ -245,7 +239,7 @@ # Reduce code bloat by reverting back to 5.0 behavior for static initializers CFLAGS += -features=no%split_init -# Use -D_Crun_inline_placement so we don't get references to +# Use -D_Crun_inline_placement so we don't get references to # __1c2n6FIpv_0_ or void*operator new(unsigned,void*) # This avoids the hard requirement of the newer Solaris C++ runtime patches. # NOTE: This is an undocumented feature of the SS10 compiler. See 6306698. --- old/hotspot/make/solaris/makefiles/vm.make 2015-06-10 15:43:53.403126110 +0200 +++ new/hotspot/make/solaris/makefiles/vm.make 2015-06-10 15:43:53.267126108 +0200 @@ -69,12 +69,12 @@ endif # The following variables are defined in the generated flags.make file. -JDK_VER_DEFS = -DJDK_MAJOR_VERSION="\"$(JDK_MAJOR_VERSION)\"" \ - -DJDK_MINOR_VERSION="\"$(JDK_MINOR_VERSION)\"" \ - -DJDK_MICRO_VERSION="\"$(JDK_MICRO_VERSION)\"" \ - -DJDK_BUILD_NUMBER="\"$(JDK_BUILD_NUMBER)\"" -VM_VER_DEFS = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\"" \ - -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\"" \ +JDK_VER_DEFS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ + -DVERSION_MINOR=$(VERSION_MINOR) \ + -DVERSION_SECURITY=$(VERSION_SECURITY) \ + -DVERSION_BUILD=$(VERSION_BUILD) +VM_VER_DEFS = -DHOTSPOT_VERSION_STRING="\"$(HOTSPOT_VERSION_STRING)\"" \ + -DVERSION_STRING="\"$(VERSION_STRING)\"" \ $(JDK_VER_DEFS) HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\" BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\"" --- old/hotspot/make/windows/build.make 2015-06-10 15:43:53.875126118 +0200 +++ new/hotspot/make/windows/build.make 2015-06-10 15:43:53.735126115 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -123,38 +123,12 @@ # or make/hotspot_distro. !ifndef HOTSPOT_VM_DISTRO !if exists($(WorkSpace)\src\closed) - -# if the build is for JDK6 or earlier version, it should include jdk6_hotspot_distro, -# instead of hotspot_distro. -JDK6_OR_EARLIER=0 -!if "$(JDK_MAJOR_VERSION)" != "" && "$(JDK_MINOR_VERSION)" != "" && "$(JDK_MICRO_VERSION)" != "" -!if $(JDK_MAJOR_VERSION) == 1 && $(JDK_MINOR_VERSION) < 7 -JDK6_OR_EARLIER=1 -!endif -!else -!if $(JDK_MAJOR_VER) == 1 && $(JDK_MINOR_VER) < 7 -JDK6_OR_EARLIER=1 -!endif -!endif - -!if $(JDK6_OR_EARLIER) == 1 -!include $(WorkSpace)\make\jdk6_hotspot_distro -!else !include $(WorkSpace)\make\hotspot_distro -!endif !else !include $(WorkSpace)\make\openjdk_distro !endif !endif -# Following the Web Start / Plugin model here.... -# We can have update versions like "01a", but Windows requires -# we use only integers in the file version field. So: -# JDK_UPDATE_VER = JDK_UPDATE_VERSION * 10 + EXCEPTION_VERSION -# -JDK_UPDATE_VER=0 -JDK_BUILD_NUMBER=0 - HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(ARCH_TEXT) $(VARIANT_TEXT) VM # JDK ProductVersion: @@ -163,34 +137,27 @@ # 1.6.0-b01 will be 6.0.0.1 # 1.6.0_01a-b02 will be 6.0.11.2 # -# JDK_* variables are defined in make/jdk_version or on command line +# STANDALONE_JDK_* variables are defined in make/jdk_version or on command line # -JDK_VER=$(JDK_MINOR_VER),$(JDK_MICRO_VER),$(JDK_UPDATE_VER),$(JDK_BUILD_NUMBER) -JDK_DOTVER=$(JDK_MINOR_VER).$(JDK_MICRO_VER).$(JDK_UPDATE_VER).$(JDK_BUILD_NUMBER) -!if "$(JRE_RELEASE_VERSION)" == "" -JRE_RELEASE_VER=$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER) -!else -JRE_RELEASE_VER=$(JRE_RELEASE_VERSION) +!if "$(JDK_VER)" == "" +JDK_VER=$(STANDALONE_JDK_MAJOR_VER),$(STANDALONE_JDK_MINOR_VER),$(STANDALONE_JDK_SECURITY_VER),$(STANDALONE_JDK_PATCH_VER) +!endif +!if "$(JDK_DOTVER)" == "" +JDK_DOTVER=$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER).$(STANDALONE_JDK_PATCH_VER) !endif -!if "$(JDK_MKTG_VERSION)" == "" -JDK_MKTG_VERSION=$(JDK_MINOR_VER).$(JDK_MICRO_VER) +!if "$(VERSION_SHORT)" == "" +VERSION_SHORT=$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER) !endif -# Hotspot Express VM FileVersion: -# 10.0-b will have DLL version 10.0.0.yz (need 4 numbers). -# -# HS_VER=$(JDK_VER) HS_DOTVER=$(JDK_DOTVER) !if "$(HOTSPOT_RELEASE_VERSION)" == "" -HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION) +HOTSPOT_RELEASE_VERSION=$(VERSION_STRING) !endif -!if "$(HOTSPOT_BUILD_VERSION)" == "" -HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION) -!else -HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION) +!if "$(HOTSPOT_VERSION_STRING)" == "" +HOTSPOT_VERSION_STRING=$(HOTSPOT_RELEASE_VERSION) !endif # End VERSIONINFO parameters @@ -280,15 +247,15 @@ @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@ @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ - @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@ - @ echo HS_BUILD_VER=$(HS_BUILD_VER) >> $@ + @ echo HS_NAME=$(PRODUCT_NAME) $(VERSION_SHORT) >> $@ + @ echo HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) >> $@ @ echo BUILD_WIN_SA=$(BUILD_WIN_SA) >> $@ - @ echo SA_BUILD_VERSION=$(HS_BUILD_VER) >> $@ + @ echo SA_BUILD_VERSION=$(HOTSPOT_VERSION_STRING) >> $@ @ echo SA_INCLUDE=$(SA_INCLUDE) >> $@ @ echo SA_LIB=$(SA_LIB) >> $@ @ echo JDK_VER=$(JDK_VER) >> $@ @ echo JDK_DOTVER=$(JDK_DOTVER) >> $@ - @ echo JRE_RELEASE_VER=$(JRE_RELEASE_VER) >> $@ + @ echo VERSION_STRING=$(VERSION_STRING) >> $@ @ echo BUILDARCH=$(BUILDARCH) >> $@ @ echo Platform_arch=$(Platform_arch) >> $@ @ echo Platform_arch_model=$(Platform_arch_model) >> $@ --- old/hotspot/make/windows/makefiles/compile.make 2015-06-10 15:43:54.343126125 +0200 +++ new/hotspot/make/windows/makefiles/compile.make 2015-06-10 15:43:54.211126123 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -# +# # # Generic compiler settings @@ -166,7 +166,7 @@ !endif -!if $(MSC_VER) >= 1600 +!if $(MSC_VER) >= 1600 LD_FLAGS= $(LD_FLAGS) psapi.lib !endif @@ -190,4 +190,3 @@ !if "$(MFC_DEBUG)" == "true" RC_FLAGS = $(RC_FLAGS) /D "_DEBUG" !endif - --- old/hotspot/make/windows/makefiles/debug.make 2015-06-10 15:43:54.799126132 +0200 +++ new/hotspot/make/windows/makefiles/debug.make 2015-06-10 15:43:54.663126130 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -# +# # HS_INTERNAL_NAME=jvm @@ -44,7 +44,7 @@ !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make -HS_BUILD_ID=$(HS_BUILD_VER)-debug +HS_BUILD_ID=$(HOTSPOT_VERSION_STRING)-debug # Force resources to be rebuilt every time $(Res_Files): FORCE --- old/hotspot/make/windows/makefiles/defs.make 2015-06-10 15:43:55.263126140 +0200 +++ new/hotspot/make/windows/makefiles/defs.make 2015-06-10 15:43:55.127126138 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -177,24 +177,17 @@ # Library suffix LIBRARY_SUFFIX=dll -# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined -# and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make. - # next parameters are defined in $(GAMMADIR)/make/defs.make. -MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) -MAKE_ARGS += JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) -MAKE_ARGS += JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) -MAKE_ARGS += JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) - -ifdef COOKED_JDK_UPDATE_VERSION - MAKE_ARGS += JDK_UPDATE_VER=$(COOKED_JDK_UPDATE_VERSION) -endif - -# COOKED_BUILD_NUMBER should only be set if we have a numeric -# build number. It must not be zero padded. -ifdef COOKED_BUILD_NUMBER - MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER) -endif +MAKE_ARGS += VERSION_SHORT=$(VERSION_SHORT) +MAKE_ARGS += VERSION_MAJOR=$(VERSION_MAJOR) +MAKE_ARGS += VERSION_MINOR=$(VERSION_MINOR) +MAKE_ARGS += VERSION_SECURITY=$(VERSION_SECURITY) +MAKE_ARGS += VERSION_BUILD=$(VERSION_BUILD) + +# JDK_DOTVER and JDK_VER are needed in Windows RC files +COMMA:=, +MAKE_ARGS += JDK_DOTVER=$(VERSION_NUMBER_FOUR_POSITIONS) +MAKE_ARGS += JDK_VER=$(subst .,$(COMMA),$(VERSION_NUMBER_FOUR_POSITIONS)) NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO ifndef SYSTEM_UNAME --- old/hotspot/make/windows/makefiles/fastdebug.make 2015-06-10 15:43:55.719126147 +0200 +++ new/hotspot/make/windows/makefiles/fastdebug.make 2015-06-10 15:43:55.583126145 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -# +# # HS_INTERNAL_NAME=jvm @@ -43,7 +43,7 @@ !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make -HS_BUILD_ID=$(HS_BUILD_VER)-fastdebug +HS_BUILD_ID=$(HOTSPOT_VERSION_STRING)-fastdebug # Force resources to be rebuilt every time $(Res_Files): FORCE --- old/hotspot/make/windows/makefiles/product.make 2015-06-10 15:43:56.175126154 +0200 +++ new/hotspot/make/windows/makefiles/product.make 2015-06-10 15:43:56.043126152 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -# +# # HS_INTERNAL_NAME=jvm @@ -46,7 +46,7 @@ !include $(WorkSpace)/make/windows/makefiles/vm.make !include local.make -HS_BUILD_ID=$(HS_BUILD_VER) +HS_BUILD_ID=$(HOTSPOT_VERSION_STRING) # Force resources to be rebuilt every time $(Res_Files): FORCE --- old/hotspot/make/windows/makefiles/vm.make 2015-06-10 15:43:56.627126161 +0200 +++ new/hotspot/make/windows/makefiles/vm.make 2015-06-10 15:43:56.491126159 +0200 @@ -58,12 +58,12 @@ !endif # The following variables are defined in the generated local.make file. -CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\"" -CXX_FLAGS=$(CXX_FLAGS) /D "JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\"" -CXX_FLAGS=$(CXX_FLAGS) /D "JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\"" -CXX_FLAGS=$(CXX_FLAGS) /D "JDK_MICRO_VERSION=\"$(JDK_MICRO_VERSION)\"" -CXX_FLAGS=$(CXX_FLAGS) /D "JDK_BUILD_NUMBER=\"$(JDK_BUILD_NUMBER)\"" -CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\"" +CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VERSION_STRING=\"$(HOTSPOT_VERSION_STRING)\"" +CXX_FLAGS=$(CXX_FLAGS) /D "VERSION_MAJOR=$(VERSION_MAJOR)" +CXX_FLAGS=$(CXX_FLAGS) /D "VERSION_MINOR=$(VERSION_MINOR)" +CXX_FLAGS=$(CXX_FLAGS) /D "VERSION_SECURITY=$(VERSION_SECURITY)" +CXX_FLAGS=$(CXX_FLAGS) /D "VERSION_BUILD=$(VERSION_BUILD)" +CXX_FLAGS=$(CXX_FLAGS) /D "VERSION_STRING=\"$(VERSION_STRING)\"" CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\"" CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" @@ -403,4 +403,3 @@ vm.def: $(Obj_Files) sh $(WorkSpace)/make/windows/build_vm_def.sh $(BUILD_VM_DEF_FLAG) - --- old/hotspot/make/windows/projectfiles/common/Makefile 2015-06-10 15:43:57.099126169 +0200 +++ new/hotspot/make/windows/projectfiles/common/Makefile 2015-06-10 15:43:56.967126167 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -19,7 +19,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -# +# # !ifdef LOCAL_MAKE @@ -80,15 +80,15 @@ !include $(HOTSPOTWORKSPACE)/make/jdk_version -!if "$(USER_RELEASE_SUFFIX)" != "" -HOTSPOT_BUILD_VERSION = internal-$(USER_RELEASE_SUFFIX) +!if "$(VERSION_OPT)" != "" +HOTSPOT_BUILD_VERSION = internal-$(VERSION_OPT) !else HOTSPOT_BUILD_VERSION = internal !endif -!if "$(JRE_RELEASE_VERSION)" != "" -JRE_RELEASE_VERSION="\\\"$(JRE_RELEASE_VERSION)\\\"" +!if "$(VERSION_STRING)" != "" +JRE_RELEASE_VERSION="\\\"$(VERSION_STRING)\\\"" !else -JRE_RELEASE_VERSION="\\\"$(JDK_MAJOR_VER).$(JDK_MINOR_VER).$(JDK_MICRO_VER)\\\"" +JRE_RELEASE_VERSION="\\\"$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER)\\\"" !endif !if "$(HOTSPOT_RELEASE_VERSION)" != "" HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\"" @@ -105,18 +105,17 @@ !else HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\"" !endif -!if "$(JDK_BUILD_NUMBER)" != "" -JDK_BUILD_NUMBER="\\\"$(JDK_BUILD_NUMBER)\\\"" -!else -JDK_BUILD_NUMBER="\\\"00\\\"" +!if "$(VERSION_BUILD)" == "" +VERSION_BUILD=0 !endif !endif -JDK_MAJOR_VERSION="\\\"$(JDK_MAJOR_VER)\\\"" -JDK_MINOR_VERSION="\\\"$(JDK_MINOR_VER)\\\"" -JDK_MICRO_VERSION="\\\"$(JDK_MICRO_VER)\\\"" +VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER) +VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER) +VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER) +VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER) -ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) -define JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) -define JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) -define JDK_BUILD_NUMBER=$(JDK_BUILD_NUMBER) -define VISUAL_STUDIO_BUILD=true +ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define VERSION_MAJOR=$(VERSION_MAJOR) -define VERSION_MINOR=$(VERSION_MINOR) -define VERSION_SECURITY=$(VERSION_SECURITY) -define VERSION_PATCH=$(VERSION_PATCH) -define VISUAL_STUDIO_BUILD=true ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions) $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class --- old/hotspot/src/share/vm/prims/jvm.h 2015-06-10 15:43:57.563126176 +0200 +++ new/hotspot/src/share/vm/prims/jvm.h 2015-06-10 15:43:57.423126174 +0200 @@ -1185,7 +1185,7 @@ */ typedef struct { /* VM version string: follows the JDK release version naming convention */ - unsigned int jvm_version; /* ..[-][-][-b] */ + unsigned int jvm_version; unsigned int update_version : 8; unsigned int special_update_version : 8; unsigned int reserved1 : 16; @@ -1206,7 +1206,7 @@ #define JVM_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24) #define JVM_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16) -#define JVM_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8) +#define JVM_VERSION_SECURITY(version) ((version & 0x0000FF00) >> 8) #define JVM_VERSION_BUILD(version) ((version & 0x000000FF)) JNIEXPORT void JNICALL @@ -1214,7 +1214,7 @@ typedef struct { // Naming convention of RE build version string: n.n.n[_uu[c]][-]-bxx - unsigned int jdk_version; /* Consists of major, minor, micro (n.n.n) */ + unsigned int jdk_version; /* Consists of major, minor, security (n.n.n) */ /* and build number (xx) */ unsigned int update_version : 8; /* Update release version (uu) */ unsigned int special_update_version : 8; /* Special update release version (c)*/ @@ -1238,9 +1238,9 @@ #define JDK_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24) #define JDK_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16) -#define JDK_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8) +#define JDK_VERSION_SECURITY(version) ((version & 0x0000FF00) >> 8) -/* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER is set to bNN) +/* Build number is available only for RE build. * It will be zero for internal builds. */ #define JDK_VERSION_BUILD(version) ((version & 0x000000FF)) --- old/hotspot/src/share/vm/runtime/arguments.cpp 2015-06-10 15:43:58.039126184 +0200 +++ new/hotspot/src/share/vm/runtime/arguments.cpp 2015-06-10 15:43:57.895126182 +0200 @@ -220,12 +220,11 @@ void Arguments::init_version_specific_system_properties() { enum { bufsz = 16 }; char buffer[bufsz]; - const char* spec_vendor = "Sun Microsystems Inc."; - uint32_t spec_version = 0; + const char* spec_vendor = "Oracle Corporation"; + uint32_t spec_version_major = 0; - spec_vendor = "Oracle Corporation"; - spec_version = JDK_Version::current().major_version(); - jio_snprintf(buffer, bufsz, "1." UINT32_FORMAT, spec_version); + spec_version_major = JDK_Version::current().major_version(); + jio_snprintf(buffer, bufsz, UINT32_FORMAT, spec_version_major); PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor", spec_vendor, false)); --- old/hotspot/src/share/vm/runtime/java.cpp 2015-06-10 15:43:58.535126192 +0200 +++ new/hotspot/src/share/vm/runtime/java.cpp 2015-06-10 15:43:58.403126190 +0200 @@ -643,20 +643,15 @@ int major = JDK_VERSION_MAJOR(info.jdk_version); int minor = JDK_VERSION_MINOR(info.jdk_version); - int micro = JDK_VERSION_MICRO(info.jdk_version); + int security = JDK_VERSION_SECURITY(info.jdk_version); int build = JDK_VERSION_BUILD(info.jdk_version); - if (major == 1 && minor > 4) { - // We represent "1.5.0" as "5.0", but 1.4.2 as itself. - major = minor; - minor = micro; - micro = 0; - } + // Incompatible with pre-4243978 JDK. if (info.pending_list_uses_discovered_field == 0) { vm_exit_during_initialization( "Incompatible JDK is not using Reference.discovered field for pending list"); } - _current = JDK_Version(major, minor, micro, info.update_version, + _current = JDK_Version(major, minor, security, info.update_version, info.special_update_version, build, info.thread_park_blocker == 1, info.post_vm_init_hook_enabled == 1); @@ -664,18 +659,18 @@ } void JDK_Version::fully_initialize( - uint8_t major, uint8_t minor, uint8_t micro, uint8_t update) { + uint8_t major, uint8_t minor, uint8_t security, uint8_t update) { // This is only called when current is less than 1.6 and we've gotten // far enough in the initialization to determine the exact version. assert(major < 6, "not needed for JDK version >= 6"); assert(is_partially_initialized(), "must not initialize"); if (major < 5) { // JDK verison sequence: 1.2.x, 1.3.x, 1.4.x, 5.0.x, 6.0.x, etc. - micro = minor; + security = minor; minor = major; major = 1; } - _current = JDK_Version(major, minor, micro, update); + _current = JDK_Version(major, minor, security, update); } void JDK_Version_init() { @@ -686,7 +681,7 @@ return ((int64_t)v.major_version() << (BitsPerByte * 5)) | ((int64_t)v.minor_version() << (BitsPerByte * 4)) | - ((int64_t)v.micro_version() << (BitsPerByte * 3)) | + ((int64_t)v.security_version() << (BitsPerByte * 3)) | ((int64_t)v.update_version() << (BitsPerByte * 2)) | ((int64_t)v.special_update_version() << (BitsPerByte * 1)) | ((int64_t)v.build_number() << (BitsPerByte * 0)); @@ -722,8 +717,8 @@ &buffer[index], buflen - index, "%d.%d", _major, _minor); if (rc == -1) return; index += rc; - if (_micro > 0) { - rc = jio_snprintf(&buffer[index], buflen - index, ".%d", _micro); + if (_security > 0) { + rc = jio_snprintf(&buffer[index], buflen - index, ".%d", _security); } if (_update > 0) { rc = jio_snprintf(&buffer[index], buflen - index, "_%02d", _update); --- old/hotspot/src/share/vm/runtime/java.hpp 2015-06-10 15:43:59.019126199 +0200 +++ new/hotspot/src/share/vm/runtime/java.hpp 2015-06-10 15:43:58.875126197 +0200 @@ -81,7 +81,7 @@ uint8_t _major; uint8_t _minor; - uint8_t _micro; + uint8_t _security; uint8_t _update; uint8_t _special; uint8_t _build; @@ -102,7 +102,7 @@ // Completes initialization for a pre-JDK6 version. static void fully_initialize(uint8_t major, uint8_t minor = 0, - uint8_t micro = 0, uint8_t update = 0); + uint8_t security = 0, uint8_t update = 0); public: @@ -111,15 +111,15 @@ return _current._partially_initialized; } - JDK_Version() : _major(0), _minor(0), _micro(0), _update(0), + JDK_Version() : _major(0), _minor(0), _security(0), _update(0), _special(0), _build(0), _partially_initialized(false), _thread_park_blocker(false), _post_vm_init_hook_enabled(false) {} - JDK_Version(uint8_t major, uint8_t minor = 0, uint8_t micro = 0, + JDK_Version(uint8_t major, uint8_t minor = 0, uint8_t security = 0, uint8_t update = 0, uint8_t special = 0, uint8_t build = 0, bool thread_park_blocker = false, bool post_vm_init_hook_enabled = false) : - _major(major), _minor(minor), _micro(micro), _update(update), + _major(major), _minor(minor), _security(security), _update(update), _special(special), _build(build), _partially_initialized(false), _thread_park_blocker(thread_park_blocker), _post_vm_init_hook_enabled(post_vm_init_hook_enabled) @@ -139,7 +139,7 @@ uint8_t major_version() const { return _major; } uint8_t minor_version() const { return _minor; } - uint8_t micro_version() const { return _micro; } + uint8_t security_version() const { return _security; } uint8_t update_version() const { return _update; } uint8_t special_update_version() const { return _special; } uint8_t build_number() const { return _build; } --- old/hotspot/src/share/vm/runtime/vmStructs.cpp 2015-06-10 15:43:59.503126207 +0200 +++ new/hotspot/src/share/vm/runtime/vmStructs.cpp 2015-06-10 15:43:59.363126205 +0200 @@ -1237,7 +1237,7 @@ static_field(Abstract_VM_Version, _s_internal_vm_info_string, const char*) \ static_field(Abstract_VM_Version, _vm_major_version, int) \ static_field(Abstract_VM_Version, _vm_minor_version, int) \ - static_field(Abstract_VM_Version, _vm_micro_version, int) \ + static_field(Abstract_VM_Version, _vm_security_version, int) \ static_field(Abstract_VM_Version, _vm_build_number, int) \ static_field(Abstract_VM_Version, _reserve_for_allocation_prefetch, int) \ \ --- old/hotspot/src/share/vm/runtime/vm_version.cpp 2015-06-10 15:44:00.055126216 +0200 +++ new/hotspot/src/share/vm/runtime/vm_version.cpp 2015-06-10 15:43:59.919126214 +0200 @@ -39,76 +39,54 @@ unsigned int Abstract_VM_Version::_L1_data_cache_line_size = 0; int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0; -#ifndef HOTSPOT_RELEASE_VERSION - #error HOTSPOT_RELEASE_VERSION must be defined +#ifndef HOTSPOT_VERSION_STRING + #error HOTSPOT_VERSION_STRING must be defined #endif -#ifndef JDK_MAJOR_VERSION - #error JDK_MAJOR_VERSION must be defined +#ifndef VERSION_MAJOR + #error VERSION_MAJOR must be defined #endif -#ifndef JDK_MINOR_VERSION - #error JDK_MINOR_VERSION must be defined +#ifndef VERSION_MINOR + #error VERSION_MINOR must be defined #endif -#ifndef JDK_MICRO_VERSION - #error JDK_MICRO_VERSION must be defined +#ifndef VERSION_SECURITY + #error VERSION_SECURITY must be defined #endif -#ifndef JDK_BUILD_NUMBER - #error JDK_BUILD_NUMBER must be defined +#ifndef VERSION_BUILD + #error VERSION_BUILD must be defined #endif -#ifndef JRE_RELEASE_VERSION - #error JRE_RELEASE_VERSION must be defined +#ifndef VERSION_STRING + #error VERSION_STRING must be defined #endif // NOTE: Builds within Visual Studio do not define the build target in -// HOTSPOT_RELEASE_VERSION, so it must be done here +// HOTSPOT_VERSION_STRING, so it must be done here #if defined(VISUAL_STUDIO_BUILD) && !defined(PRODUCT) #ifndef HOTSPOT_BUILD_TARGET #error HOTSPOT_BUILD_TARGET must be defined #endif - #define VM_RELEASE HOTSPOT_RELEASE_VERSION "-" HOTSPOT_BUILD_TARGET + #define VM_RELEASE HOTSPOT_VERSION_STRING "-" HOTSPOT_BUILD_TARGET #else - #define VM_RELEASE HOTSPOT_RELEASE_VERSION + #define VM_RELEASE HOTSPOT_VERSION_STRING #endif -// HOTSPOT_RELEASE_VERSION follows the JDK release version naming convention -// ..[-][-][-b] -int Abstract_VM_Version::_vm_major_version = 0; -int Abstract_VM_Version::_vm_minor_version = 0; -int Abstract_VM_Version::_vm_micro_version = 0; -int Abstract_VM_Version::_vm_build_number = 0; +// HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden +// in a standalone build). +int Abstract_VM_Version::_vm_major_version = VERSION_MAJOR; +int Abstract_VM_Version::_vm_minor_version = VERSION_MINOR; +int Abstract_VM_Version::_vm_security_version = VERSION_SECURITY; +int Abstract_VM_Version::_vm_build_number = VERSION_BUILD; bool Abstract_VM_Version::_initialized = false; unsigned int Abstract_VM_Version::_parallel_worker_threads = 0; bool Abstract_VM_Version::_parallel_worker_threads_initialized = false; -#ifdef ASSERT -static void assert_digits(const char * s, const char * message) { - for (int i = 0; s[i] != '\0'; i++) { - assert(isdigit(s[i]), message); - } -} -#endif - -static void set_version_field(int * version_field, const char * version_str, - const char * const assert_msg) { - if (version_str != NULL && *version_str != '\0') { - DEBUG_ONLY(assert_digits(version_str, assert_msg)); - *version_field = atoi(version_str); - } -} - void Abstract_VM_Version::initialize() { + // FIXME: Initialization can probably be removed now. if (_initialized) { return; } - set_version_field(&_vm_major_version, JDK_MAJOR_VERSION, "bad major version"); - set_version_field(&_vm_minor_version, JDK_MINOR_VERSION, "bad minor version"); - set_version_field(&_vm_micro_version, JDK_MICRO_VERSION, "bad micro version"); - int offset = (JDK_BUILD_NUMBER != NULL && JDK_BUILD_NUMBER[0] == 'b') ? 1 : 0; - set_version_field(&_vm_build_number, &JDK_BUILD_NUMBER[offset], - "bad build number"); - _initialized = true; } @@ -178,7 +156,7 @@ // fatal error handlers. if the crash is in native thread, // stringStream cannot get resource allocated and will SEGV. const char* Abstract_VM_Version::jre_release_version() { - return JRE_RELEASE_VERSION; + return VERSION_STRING; } #define OS LINUX_ONLY("linux") \ @@ -259,7 +237,7 @@ #endif return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR - " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__ + " JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; } @@ -270,7 +248,7 @@ unsigned int Abstract_VM_Version::jvm_version() { return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) | ((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) | - ((Abstract_VM_Version::vm_micro_version() & 0xFF) << 8) | + ((Abstract_VM_Version::vm_security_version() & 0xFF) << 8) | (Abstract_VM_Version::vm_build_number() & 0xFF); } --- old/hotspot/src/share/vm/runtime/vm_version.hpp 2015-06-10 15:44:00.507126223 +0200 +++ new/hotspot/src/share/vm/runtime/vm_version.hpp 2015-06-10 15:44:00.371126221 +0200 @@ -45,7 +45,7 @@ static unsigned int _L1_data_cache_line_size; static int _vm_major_version; static int _vm_minor_version; - static int _vm_micro_version; + static int _vm_security_version; static int _vm_build_number; static bool _initialized; static unsigned int _parallel_worker_threads; @@ -70,7 +70,7 @@ static int vm_major_version() { assert(_initialized, "not initialized"); return _vm_major_version; } static int vm_minor_version() { assert(_initialized, "not initialized"); return _vm_minor_version; } - static int vm_micro_version() { assert(_initialized, "not initialized"); return _vm_micro_version; } + static int vm_security_version() { assert(_initialized, "not initialized"); return _vm_security_version; } static int vm_build_number() { assert(_initialized, "not initialized"); return _vm_build_number; } // Gets the jvm_version_info.jvm_version defined in jvm.h --- old/hotspot/test/runtime/6981737/Test6981737.java 2015-06-10 15:44:00.955126230 +0200 +++ new/hotspot/test/runtime/6981737/Test6981737.java 2015-06-10 15:44:00.823126228 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,12 +38,13 @@ */ public static void main(String[] args) throws Exception { - String version = verifyProperty("java.version", "[0-9]+\\.[0-9]+\\..*"); - String major_version_spec = version.split("\\.")[1]; + String version = verifyProperty("java.version", "[0-9]+[\\\\.[0-9]+]*\\-.*"); + String version_tokens[] = version.split("-|\\."); + String major_version_spec = version_tokens[0]; int major_version = new Integer(major_version_spec).intValue(); String vendor_re = "Oracle Corporation"; - String vm_spec_version_re = "1\\." + major_version_spec; + String vm_spec_version_re = major_version_spec; if (major_version < 7) { vendor_re = "Sun Microsystems Inc\\."; vm_spec_version_re = "1\\.0"; --- old/jdk/make/CompileDemos.gmk 2015-06-10 15:44:01.543126240 +0200 +++ new/jdk/make/CompileDemos.gmk 2015-06-10 15:44:01.291126236 +0200 @@ -55,7 +55,8 @@ SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \ OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/demo/java-main-manifest.mf, \ REPLACEMENTS := \ - @@RELEASE@@ => $(RELEASE) ; \ + @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \ + @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \ @@COMPANY_NAME@@ => $(COMPANY_NAME) , \ )) --- old/jdk/make/data/mainmanifest/manifest.mf 2015-06-10 15:44:02.179126250 +0200 +++ new/jdk/make/data/mainmanifest/manifest.mf 2015-06-10 15:44:01.931126246 +0200 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Specification-Title: Java Platform API Specification -Specification-Version: 1.9 +Specification-Version: @@VERSION_SPECIFICATION@@ Specification-Vendor: Oracle Corporation Implementation-Title: Java Runtime Environment -Implementation-Version: @@RELEASE@@ +Implementation-Version: @@VERSION_SHORT@@ Implementation-Vendor: @@COMPANY_NAME@@ --- old/jdk/make/gensrc/GensrcMisc.gmk 2015-06-10 15:44:02.811126260 +0200 +++ new/jdk/make/gensrc/GensrcMisc.gmk 2015-06-10 15:44:02.559126256 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,28 +26,18 @@ ########################################################################################## # Install the launcher name, release version string, full version # string and the runtime name into the Version.java file. -# To be printed by java -version -# These dependencies should ideally be added to prerequesites for Version.java -# but skip for now until we have better incremental build for java. -# $(call DependOnVariable, LAUNCHER_NAME) \ -# $(call DependOnVariable, RELEASE) \ -# $(call DependOnVariable, FULL_VERSION) \ -# $(call DependOnVariable, RUNTIME_VERSION) +$(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \ + SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/sun/misc/Version.java.template, \ + OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java, \ + REPLACEMENTS := \ + @@LAUNCHER_NAME@@ => $(LAUNCHER_NAME) ; \ + @@RUNTIME_NAME@@ => $(RUNTIME_NAME) ; \ + @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \ + @@VERSION_STRING@@ => $(VERSION_STRING), \ +)) -$(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java: \ - $(JDK_TOPDIR)/src/java.base/share/classes/sun/misc/Version.java.template - $(MKDIR) -p $(@D) - $(RM) $@ $@.tmp - $(ECHO) Generating sun/misc/Version.java - $(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \ - -e 's/@@java_version@@/$(RELEASE)/g' \ - -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \ - -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \ - $< > $@.tmp - $(MV) $@.tmp $@ - -GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/misc/Version.java +GENSRC_JAVA_BASE += $(BUILD_VERSION_JAVA) ########################################################################################## --- old/jdk/make/launcher/Launcher-jdk.accessibility.gmk 2015-06-10 15:44:03.439126270 +0200 +++ new/jdk/make/launcher/Launcher-jdk.accessibility.gmk 2015-06-10 15:44:03.187126266 +0200 @@ -52,7 +52,7 @@ -D "JDK_INTERNAL_NAME=jabswitch" \ -D "JDK_FTYPE=0x01L", \ MANIFEST := $(JABSWITCH_SRC)/jabswitch.manifest, \ - MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ + MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ )) TARGETS += $(BUILD_JABSWITCH) --- old/jdk/make/launcher/Launcher-jdk.pack200.gmk 2015-06-10 15:44:04.071126280 +0200 +++ new/jdk/make/launcher/Launcher-jdk.pack200.gmk 2015-06-10 15:44:03.823126276 +0200 @@ -103,7 +103,7 @@ -D "JDK_FTYPE=0x1L", \ DEBUG_SYMBOLS := true, \ MANIFEST := $(JDK_TOPDIR)/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest, \ - MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ + MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ )) ifneq ($(USE_EXTERNAL_LIBZ), true) --- old/jdk/make/launcher/LauncherCommon.gmk 2015-06-10 15:44:04.695126290 +0200 +++ new/jdk/make/launcher/LauncherCommon.gmk 2015-06-10 15:44:04.439126286 +0200 @@ -164,9 +164,7 @@ OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \ CFLAGS := $$($1_CFLAGS) \ $(LAUNCHER_CFLAGS) \ - -DFULL_VERSION='"$(FULL_VERSION)"' \ - -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ - -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ + $(VERSION_CFLAGS) \ -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ -DPROGNAME='"$1"' $(DPACKAGEPATH) \ $2, \ @@ -198,7 +196,7 @@ -D "JDK_FTYPE=0x1L" \ $7, \ MANIFEST := $(JAVA_MANIFEST), \ - MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \ + MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \ CODESIGN := $$($1_CODESIGN), \ ) --- old/jdk/make/lib/CoreLibraries.gmk 2015-06-10 15:44:05.315126300 +0200 +++ new/jdk/make/lib/CoreLibraries.gmk 2015-06-10 15:44:05.063126296 +0200 @@ -119,15 +119,6 @@ -I$(SUPPORT_OUTPUTDIR)/headers/java.base \ -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' -LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ - -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ - -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \ - -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' - -ifneq (, $(JDK_UPDATE_VERSION)) - LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' -endif - ifeq ($(OPENJDK_TARGET_OS), macosx) BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c @@ -146,6 +137,8 @@ OPTIMIZATION := HIGH, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(LIBJAVA_CFLAGS), \ + System.c_CFLAGS := $(VERSION_CFLAGS), \ + jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ --- old/jdk/src/java.base/share/classes/sun/misc/Version.java.template 2015-06-10 15:44:05.951126310 +0200 +++ new/jdk/src/java.base/share/classes/sun/misc/Version.java.template 2015-06-10 15:44:05.691126306 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,16 +30,16 @@ private static final String launcher_name = - "@@launcher_name@@"; + "@@LAUNCHER_NAME@@"; private static final String java_version = - "@@java_version@@"; + "@@VERSION_SHORT@@"; private static final String java_runtime_name = - "@@java_runtime_name@@"; + "@@RUNTIME_NAME@@"; private static final String java_runtime_version = - "@@java_runtime_version@@"; + "@@VERSION_STRING@@"; static { init(); @@ -54,13 +54,13 @@ private static boolean versionsInitialized = false; private static int jvm_major_version = 0; private static int jvm_minor_version = 0; - private static int jvm_micro_version = 0; + private static int jvm_security_version = 0; private static int jvm_update_version = 0; private static int jvm_build_number = 0; private static String jvm_special_version = null; private static int jdk_major_version = 0; private static int jdk_minor_version = 0; - private static int jdk_micro_version = 0; + private static int jdk_security_version = 0; private static int jdk_update_version = 0; private static int jdk_build_number = 0; private static String jdk_special_version = null; @@ -146,16 +146,16 @@ /** - * Returns the micro version of the running JVM if it's 1.6 or newer + * Returns the security version of the running JVM if it's 1.6 or newer * or any RE VM build. It will return 0 if it's an internal 1.5 or * 1.4.x build. * @since 1.6 */ - public static synchronized int jvmMicroVersion() { + public static synchronized int jvmSecurityVersion() { if (!versionsInitialized) { initVersions(); } - return jvm_micro_version; + return jvm_security_version; } /** @@ -217,14 +217,14 @@ } /** - * Returns the micro version of the running JDK. + * Returns the security version of the running JDK. * @since 1.6 */ - public static synchronized int jdkMicroVersion() { + public static synchronized int jdkSecurityVersion() { if (!versionsInitialized) { initVersions(); } - return jdk_micro_version; + return jdk_security_version; } /** @@ -281,7 +281,7 @@ Character.isDigit(cs.charAt(4))) { jvm_major_version = Character.digit(cs.charAt(0), 10); jvm_minor_version = Character.digit(cs.charAt(2), 10); - jvm_micro_version = Character.digit(cs.charAt(4), 10); + jvm_security_version = Character.digit(cs.charAt(4), 10); cs = cs.subSequence(5, cs.length()); if (cs.charAt(0) == '_' && cs.length() >= 3 && Character.isDigit(cs.charAt(1)) && --- old/jdk/src/java.base/share/native/include/jvm.h 2015-06-10 15:44:06.579126320 +0200 +++ new/jdk/src/java.base/share/native/include/jvm.h 2015-06-10 15:44:06.327126316 +0200 @@ -49,7 +49,7 @@ * These functions allow the verifier and format checker to be written * in a VM-independent way. * - * Third, this file contains various I/O and nerwork operations needed + * Third, this file contains various I/O and network operations needed * by the standard Java I/O and network APIs. */ @@ -1127,9 +1127,7 @@ * ========================================================================== */ typedef struct { - /* Naming convention of RE build version string: n.n.n[_uu[c]][-]-bxx */ - unsigned int jvm_version; /* Consists of major, minor, micro (n.n.n) */ - /* and build number (xx) */ + unsigned int jvm_version; /* Follows JDK version string as specified by JEP-223 */ unsigned int update_version : 8; /* Update release version (uu) */ unsigned int special_update_version : 8; /* Special update release version (c)*/ unsigned int reserved1 : 16; @@ -1150,7 +1148,7 @@ #define JVM_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24) #define JVM_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16) -#define JVM_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8) +#define JVM_VERSION_SECURITY(version) ((version & 0x0000FF00) >> 8) /* Build number is available only for RE builds. * It will be zero for internal builds. @@ -1161,9 +1159,7 @@ JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size); typedef struct { - // Naming convention of RE build version string: n.n.n[_uu[c]][-]-bxx - unsigned int jdk_version; /* Consists of major, minor, micro (n.n.n) */ - /* and build number (xx) */ + unsigned int jdk_version; /* JDK version string as specified by JEP-223 */ unsigned int update_version : 8; /* Update release version (uu) */ unsigned int special_update_version : 8; /* Special update release version (c)*/ unsigned int reserved1 : 16; @@ -1186,9 +1182,9 @@ #define JDK_VERSION_MAJOR(version) ((version & 0xFF000000) >> 24) #define JDK_VERSION_MINOR(version) ((version & 0x00FF0000) >> 16) -#define JDK_VERSION_MICRO(version) ((version & 0x0000FF00) >> 8) +#define JDK_VERSION_SECURITY(version) ((version & 0x0000FF00) >> 8) -/* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER is set to bNN) +/* Build number is available only for RE build (i.e. JDK_BUILD_NUMBER is set to NN) * It will be zero for internal builds. */ #define JDK_VERSION_BUILD(version) ((version & 0x000000FF)) --- old/jdk/src/java.base/share/native/launcher/defines.h 2015-06-10 15:44:07.231126330 +0200 +++ new/jdk/src/java.base/share/native/launcher/defines.h 2015-06-10 15:44:06.975126326 +0200 @@ -28,17 +28,20 @@ #include "java.h" +#define STR_HELPER(x) #x +#define STR(x) STR_HELPER(x) + /* * This file contains commonly defined constants used only by main.c * and should not be included by another file. */ -#ifndef FULL_VERSION +#ifndef VERSION_STRING /* make sure the compilation fails */ -#error "FULL_VERSION must be defined" +#error "VERSION_STRING must be defined" #endif -#if defined(JDK_MAJOR_VERSION) && defined(JDK_MINOR_VERSION) -#define DOT_VERSION JDK_MAJOR_VERSION "." JDK_MINOR_VERSION +#if defined(VERSION_MAJOR) && defined(VERSION_MINOR) +#define DOT_VERSION STR(VERSION_MAJOR) "." STR(VERSION_MINOR) #else /* make sure the compilation fails */ #error "JDK_MAJOR_VERSION and JDK_MINOR_VERSION must be defined" --- old/jdk/src/java.base/share/native/launcher/main.c 2015-06-10 15:44:07.863126340 +0200 +++ new/jdk/src/java.base/share/native/launcher/main.c 2015-06-10 15:44:07.607126336 +0200 @@ -125,7 +125,7 @@ return JLI_Launch(margc, margv, sizeof(const_jargs) / sizeof(char *), const_jargs, sizeof(const_appclasspath) / sizeof(char *), const_appclasspath, - FULL_VERSION, + VERSION_STRING, DOT_VERSION, (const_progname != NULL) ? const_progname : *margv, (const_launcher != NULL) ? const_launcher : *margv, --- old/jdk/src/java.base/share/native/libjava/System.c 2015-06-10 15:44:08.487126350 +0200 +++ new/jdk/src/java.base/share/native/libjava/System.c 2015-06-10 15:44:08.231126346 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -208,13 +208,13 @@ CHECK_NULL_RETURN(getPropID, NULL); PUTPROP(props, "java.specification.version", - JDK_MAJOR_VERSION "." JDK_MINOR_VERSION); + VERSION_SPECIFICATION); PUTPROP(props, "java.specification.name", "Java Platform API Specification"); PUTPROP(props, "java.specification.vendor", JAVA_SPECIFICATION_VENDOR); - PUTPROP(props, "java.version", RELEASE); + PUTPROP(props, "java.version", VERSION_SHORT); PUTPROP(props, "java.vendor", VENDOR); PUTPROP(props, "java.vendor.url", VENDOR_URL); PUTPROP(props, "java.vendor.url.bug", VENDOR_URL_BUG); --- old/jdk/src/java.base/share/native/libjava/Version.c 2015-06-10 15:44:09.115126360 +0200 +++ new/jdk/src/java.base/share/native/libjava/Version.c 2015-06-10 15:44:08.859126356 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,7 +63,7 @@ JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE); setStaticIntField(env, cls, "jvm_minor_version", JVM_VERSION_MINOR(info.jvm_version)); JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE); - setStaticIntField(env, cls, "jvm_micro_version", JVM_VERSION_MICRO(info.jvm_version)); + setStaticIntField(env, cls, "jvm_security_version", JVM_VERSION_SECURITY(info.jvm_version)); JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE); setStaticIntField(env, cls, "jvm_build_number", JVM_VERSION_BUILD(info.jvm_version)); JNU_CHECK_EXCEPTION_RETURN(env, JNI_FALSE); @@ -94,7 +94,7 @@ JNU_CHECK_EXCEPTION(env); setStaticIntField(env, cls, "jdk_minor_version", JDK_VERSION_MINOR(info.jdk_version)); JNU_CHECK_EXCEPTION(env); - setStaticIntField(env, cls, "jdk_micro_version", JDK_VERSION_MICRO(info.jdk_version)); + setStaticIntField(env, cls, "jdk_security_version", JDK_VERSION_SECURITY(info.jdk_version)); JNU_CHECK_EXCEPTION(env); setStaticIntField(env, cls, "jdk_build_number", JDK_VERSION_BUILD(info.jdk_version)); JNU_CHECK_EXCEPTION(env); --- old/jdk/src/java.base/share/native/libjava/jdk_util.c 2015-06-10 15:44:09.739126370 +0200 +++ new/jdk/src/java.base/share/native/libjava/jdk_util.c 2015-06-10 15:44:09.483126366 +0200 @@ -31,72 +31,22 @@ #include "jvm.h" #include "jdk_util.h" -#ifndef JDK_UPDATE_VERSION - /* if not defined set to 00 */ - #define JDK_UPDATE_VERSION "00" -#endif - JNIEXPORT void JDK_GetVersionInfo0(jdk_version_info* info, size_t info_size) { - /* These JDK_* macros are set at Makefile or the command line */ - const unsigned int jdk_major_version = - (unsigned int) atoi(JDK_MAJOR_VERSION); - const unsigned int jdk_minor_version = - (unsigned int) atoi(JDK_MINOR_VERSION); - const unsigned int jdk_micro_version = - (unsigned int) atoi(JDK_MICRO_VERSION); - - const char* jdk_build_string = JDK_BUILD_NUMBER; - char build_number[4]; - unsigned int jdk_build_number = 0; - - const char* jdk_update_string = JDK_UPDATE_VERSION; - unsigned int jdk_update_version = 0; - char update_ver[3]; - char jdk_special_version = '\0'; - - /* If the JDK_BUILD_NUMBER is of format bXX and XX is an integer - * XX is the jdk_build_number. - */ - size_t len = strlen(jdk_build_string); - if (jdk_build_string[0] == 'b' && len >= 2) { - size_t i = 0; - for (i = 1; i < len; i++) { - if (isdigit(jdk_build_string[i])) { - build_number[i-1] = jdk_build_string[i]; - } else { - // invalid build number - i = -1; - break; - } - } - if (i == len) { - build_number[len-1] = '\0'; - jdk_build_number = (unsigned int) atoi(build_number) ; - } - } - - assert(jdk_build_number <= 255); - - if (strlen(jdk_update_string) == 2 || strlen(jdk_update_string) == 3) { - if (isdigit(jdk_update_string[0]) && isdigit(jdk_update_string[1])) { - update_ver[0] = jdk_update_string[0]; - update_ver[1] = jdk_update_string[1]; - update_ver[2] = '\0'; - jdk_update_version = (unsigned int) atoi(update_ver); - if (strlen(jdk_update_string) == 3) { - jdk_special_version = jdk_update_string[2]; - } - } - } + /* These VERSION_* macros are given by the build system */ + const unsigned int version_major = VERSION_MAJOR; + const unsigned int version_minor = VERSION_MINOR; + const unsigned int version_security = VERSION_SECURITY; + const unsigned int version_build = VERSION_BUILD; memset(info, 0, info_size); - info->jdk_version = ((jdk_major_version & 0xFF) << 24) | - ((jdk_minor_version & 0xFF) << 16) | - ((jdk_micro_version & 0xFF) << 8) | - (jdk_build_number & 0xFF); - info->update_version = jdk_update_version; - info->special_update_version = (unsigned int) jdk_special_version; + info->jdk_version = ((version_major & 0xFF) << 24) | + ((version_minor & 0xFF) << 16) | + ((version_security & 0xFF) << 8) | + (version_build & 0xFF); + // FIXME: update_version and special_update_version does not make sense anymore. + info->update_version = 0; + info->special_update_version = 0; info->thread_park_blocker = 1; // Advertise presence of sun.misc.PostVMInitHook: // future optimization: detect if this is enabled. --- old/jdk/src/java.base/windows/native/common/version.rc 2015-06-10 15:44:10.363126380 +0200 +++ new/jdk/src/java.base/windows/native/common/version.rc 2015-06-10 15:44:10.111126376 +0200 @@ -1,5 +1,5 @@ // -// Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" VALUE "FileVersion", XSTR(JDK_VER) "\0" - VALUE "Full Version", XSTR(JDK_BUILD_ID) "\0" + VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" --- old/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc 2015-06-10 15:44:11.127126392 +0200 +++ new/jdk/src/java.desktop/windows/native/libawt/windows/awt.rc 2015-06-10 15:44:10.867126388 +0200 @@ -1,5 +1,5 @@ -// -// Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved. +// +// Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // // This code is free software; you can redistribute it and/or modify it @@ -69,7 +69,7 @@ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" VALUE "FileVersion", XSTR(JDK_VER) "\0" - VALUE "Full Version", XSTR(JDK_BUILD_ID) "\0" + VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" --- old/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC 2015-06-10 15:44:11.887126404 +0200 +++ new/jdk/src/jdk.accessibility/windows/native/common/AccessBridgeStatusWindow.RC 2015-06-10 15:44:11.631126400 +0200 @@ -44,7 +44,7 @@ LTEXT "Status:",IDC_STATIC,11,149,23,8 EDITTEXT cWindowsID,67,39,121,13,ES_READONLY LTEXT "Windows ID:",IDC_STATIC,21,41,42,8 - EDITTEXT cCallInfo,12,65,184,75,ES_MULTILINE | ES_AUTOVSCROLL | + EDITTEXT cCallInfo,12,65,184,75,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL GROUPBOX "Call info",IDC_STATIC,4,55,197,90 EDITTEXT cInvokedByText,67,1,121,13,ES_READONLY @@ -67,12 +67,12 @@ // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE DISCARDABLE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE DISCARDABLE BEGIN "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" "#include ""windows.h""\r\n" @@ -80,7 +80,7 @@ "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE DISCARDABLE BEGIN "\r\n" "\0" @@ -95,7 +95,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO DISCARDABLE BEGIN "ACCESSBRIDGESTATUSWINDOW", DIALOG BEGIN @@ -142,7 +142,7 @@ VALUE "CompanyName", XSTR(JDK_COMPANY) "\0" VALUE "FileDescription", XSTR(JDK_COMPONENT) "\0" VALUE "FileVersion", XSTR(JDK_VER) "\0" - VALUE "Full Version", XSTR(JDK_BUILD_ID) "\0" + VALUE "Full Version", XSTR(JDK_VERSION_STRING) "\0" VALUE "InternalName", XSTR(JDK_INTERNAL_NAME) "\0" VALUE "LegalCopyright", XSTR(JDK_COPYRIGHT) "\0" VALUE "OriginalFilename", XSTR(JDK_FNAME) "\0" @@ -172,4 +172,3 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - --- old/jdk/test/sun/misc/Version/Version.java 2015-06-10 15:44:12.531126414 +0200 +++ new/jdk/test/sun/misc/Version/Version.java 2015-06-10 15:44:12.255126410 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ VersionInfo jdk = newVersionInfo(System.getProperty("java.runtime.version")); VersionInfo v1 = new VersionInfo(jdkMajorVersion(), jdkMinorVersion(), - jdkMicroVersion(), + jdkSecurityVersion(), jdkUpdateVersion(), jdkSpecialVersion(), jdkBuildNumber()); @@ -48,7 +48,7 @@ VersionInfo jvm = newVersionInfo(System.getProperty("java.vm.version")); VersionInfo v2 = new VersionInfo(jvmMajorVersion(), jvmMinorVersion(), - jvmMicroVersion(), + jvmSecurityVersion(), jvmUpdateVersion(), jvmSpecialVersion(), jvmBuildNumber()); --- old/langtools/make/gensrc/GensrcCommon.gmk 2015-06-10 15:44:13.031126422 +0200 +++ new/langtools/make/gensrc/GensrcCommon.gmk 2015-06-10 15:44:12.871126420 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -50,7 +50,7 @@ define SetupVersionProperties $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2): $(MKDIR) -p $$(@D) - $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \ + $(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \ > $$@ $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2) @@ -68,7 +68,7 @@ # Convert .../src//share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties # to .../langtools/gensrc//com/sun/tools/javac/resources/javac_zh_CN.java - # Strip away prefix and suffix, leaving for example only: + # Strip away prefix and suffix, leaving for example only: # "/share/classes/com/sun/tools/javac/resources/javac_zh_CN" PROPJAVAS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/%, \ $(SUPPORT_OUTPUTDIR)/gensrc/%, \ --- old/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java 2015-06-10 15:44:13.523126430 +0200 +++ new/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java 2015-06-10 15:44:13.363126428 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -168,7 +168,7 @@ String specVersion = System.getProperty("java.specification.version"); switch (specVersion) { - case "1.9": + case "9": return RELEASE_9; case "1.8": return RELEASE_8; --- old/langtools/test/tools/javac/options/modes/InfoOptsTest.java 2015-06-10 15:44:14.023126438 +0200 +++ new/langtools/test/tools/javac/options/modes/InfoOptsTest.java 2015-06-10 15:44:13.867126436 +0200 @@ -48,7 +48,7 @@ String specVersion = System.getProperty("java.specification.version"); testInfoOpt("-version", "javac", specVersion); - testInfoOpt("-fullversion", "javac", specVersion, "-b"); + testInfoOpt("-fullversion", "javac", specVersion, "+"); } void testInfoOpt(String opt, String... expect) { --- old/langtools/test/tools/javac/options/modes/SourceTargetTest.java 2015-06-10 15:44:14.519126446 +0200 +++ new/langtools/test/tools/javac/options/modes/SourceTargetTest.java 2015-06-10 15:44:14.351126443 +0200 @@ -45,7 +45,10 @@ @Test void testSourceTarget() throws IOException { String v = System.getProperty("java.specification.version"); - String latest = v.substring(v.lastIndexOf(".") + 1); + String[] va = v.split("\\."); + int major = Integer.parseInt(va[0]); + boolean newVersion = major > 8; + String latest = (newVersion) ? va[0] : va[1]; String prev = String.valueOf(Integer.valueOf(latest) - 1); writeFile("C.java", "class C { }"); --- old/nashorn/make/BuildNashorn.gmk 2015-06-10 15:44:14.983126453 +0200 +++ new/nashorn/make/BuildNashorn.gmk 2015-06-10 15:44:14.847126451 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -30,19 +30,12 @@ include MakeBase.gmk include JavaCompilation.gmk include SetupJavaCompilers.gmk +include TextFileProcessing.gmk JDK_CLASSES := $(subst $(SPACE),$(PATH_SEP),$(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \ java.base java.logging java.scripting))) NASHORN_JAR := $(IMAGES_OUTPUTDIR)/nashorn.jar -NASHORN_VERSION := $(JDK_VERSION) -NASHORN_FULL_VERSION := $(FULL_VERSION) - -ifdef MILESTONE - ifeq ($(MILESTONE), internal) - NASHORN_VERSION = $(FULL_VERSION) - endif -endif # Need to use source and target 8 for nasgen to work. $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ @@ -88,25 +81,23 @@ $(TOUCH) $@ # Version file needs to be processed with version numbers -VERSION_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties -VERSION_SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template +$(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \ + SOURCE_FILES := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \ + OUTPUT_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties, \ + REPLACEMENTS := \ + @@VERSION_STRING@@ => $(VERSION_STRING) ; \ + @@VERSION_SHORT@@ => $(VERSION_SHORT) , \ +)) -# Needs to happen after nasgen run since nasgen run deletes it -$(VERSION_FILE): $(NASGEN_RUN_FILE) -$(VERSION_FILE): $(VERSION_SRC) - $(ECHO) Creating version.properties - $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \ - -e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \ - -e '/^#.*$$/d' -e '/^$$/d' > $@ +# Version processing needs to happen after nasgen run since nasgen run deletes it +$(BUILD_VERSION_FILE): $(NASGEN_RUN_FILE) -MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION) +MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(VERSION_SHORT) # Create nashorn.jar from the final classes dir $(eval $(call SetupArchive,BUILD_NASHORN_JAR, \ - DEPENDENCIES := $(NASGEN_RUN_FILE) \ - $(VERSION_FILE), \ + DEPENDENCIES := $(NASGEN_RUN_FILE) $(BUILD_VERSION_FILE), \ SRCS := $(NASHORN_CLASSES_DIR), \ SUFFIXES := .class .js .properties Factory, \ MANIFEST := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF, \ @@ -114,7 +105,7 @@ SKIP_METAINF := true, \ JAR := $(NASHORN_JAR))) -compile: $(NASHORN_RUN_FILE) $(VERSION_FILE) +compile: $(NASHORN_RUN_FILE) $(BUILD_VERSION_FILE) all: $(NASHORN_JAR) .PHONY: compile all --- old/nashorn/make/build.xml 2015-06-10 15:44:15.439126461 +0200 +++ new/nashorn/make/build.xml 2015-06-10 15:44:15.311126459 +0200 @@ -1,7 +1,7 @@