Merge
This commit is contained in:
Iris Clark
commit
cd2bc0930d
@ -77,7 +77,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
[FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`]
|
||||
[FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`]
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring])
|
||||
AC_MSG_NOTICE([(Your Boot JDK must be version 8 or 9)])
|
||||
|
||||
@ -45,6 +45,7 @@ m4_include([build-performance.m4])
|
||||
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])
|
||||
@ -128,7 +129,7 @@ PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION
|
||||
|
||||
# We need build & target for this.
|
||||
JDKOPT_SETUP_JDK_OPTIONS
|
||||
JDKOPT_SETUP_JDK_VERSION_NUMBERS
|
||||
JDKVER_SETUP_JDK_VERSION_NUMBERS
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
|
||||
@ -190,13 +190,13 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
|
||||
# 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)\" \
|
||||
-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)
|
||||
|
||||
@ -661,10 +661,6 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
|
||||
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"
|
||||
|
||||
@ -827,9 +827,18 @@ JAVA
|
||||
BOOT_JDK
|
||||
JAVA_CHECK
|
||||
JAVAC_CHECK
|
||||
COOKED_BUILD_NUMBER
|
||||
JDK_VERSION
|
||||
COPYRIGHT_YEAR
|
||||
VERSION_IS_GA
|
||||
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
|
||||
@ -837,13 +846,7 @@ JDK_RC_PLATFORM_NAME
|
||||
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
|
||||
UNLIMITED_CRYPTO
|
||||
CACERTS_FILE
|
||||
@ -1060,11 +1063,19 @@ enable_headful
|
||||
enable_hotspot_test_in_build
|
||||
with_cacerts_file
|
||||
enable_unlimited_crypto
|
||||
with_copyright_year
|
||||
with_milestone
|
||||
with_update_version
|
||||
with_user_release_suffix
|
||||
with_build_number
|
||||
with_copyright_year
|
||||
with_version_string
|
||||
with_version_pre
|
||||
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
|
||||
@ -1905,13 +1916,31 @@ Optional Packages:
|
||||
--with-output-sync set make output sync type if supported by make.
|
||||
[recurse]
|
||||
--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 Set the base part of the version 'PRE' field
|
||||
(pre-release identifier) ['internal']
|
||||
--with-version-opt Set version 'OPT' field (build metadata)
|
||||
[<timestamp>.<user>.<dirname>]
|
||||
--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
|
||||
@ -3969,22 +3998,62 @@ pkgadd_help() {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
# Setup version numbers
|
||||
# Enable or disable the elliptic curve crypto implementation
|
||||
#
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
################################################################################
|
||||
#
|
||||
# Gcov coverage data for hotspot
|
||||
#
|
||||
|
||||
|
||||
#
|
||||
# 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, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
@ -4595,7 +4664,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
||||
#CUSTOM_AUTOCONF_INCLUDE
|
||||
|
||||
# Do not change or remove the following line, it is needed for consistency checks:
|
||||
DATE_WHEN_GENERATED=1445964676
|
||||
DATE_WHEN_GENERATED=1446400480
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@ -21320,12 +21389,6 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
# Enable or disable the elliptic curve crypto implementation
|
||||
#
|
||||
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
# Compress jars
|
||||
@ -21334,94 +21397,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Source the version numbers
|
||||
. $AUTOCONF_DIR/version-numbers
|
||||
|
||||
# Get the settings from parameters
|
||||
|
||||
# Check whether --with-milestone was given.
|
||||
if test "${with_milestone+set}" = set; then :
|
||||
withval=$with_milestone;
|
||||
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;
|
||||
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;
|
||||
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;
|
||||
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"
|
||||
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.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Setup default copyright year. Mostly overridden when building close to a new year.
|
||||
|
||||
# Check whether --with-copyright-year was given.
|
||||
if test "${with_copyright_year+set}" = set; then :
|
||||
@ -21437,14 +21413,442 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
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}"
|
||||
|
||||
# Warn user that old version arguments are deprecated.
|
||||
|
||||
|
||||
# Check whether --with-milestone was given.
|
||||
if test "${with_milestone+set}" = set; then :
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-update-version was given.
|
||||
if test "${with_update_version+set}" = set; then :
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-user-release-suffix was given.
|
||||
if test "${with_user_release_suffix+set}" = set; then :
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-build-number was given.
|
||||
if test "${with_build_number+set}" = set; then :
|
||||
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_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]+))?((\+)([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=${BASH_REMATCH[9]}
|
||||
version_plus_separator=${BASH_REMATCH[11]}
|
||||
VERSION_BUILD=${BASH_REMATCH[12]}
|
||||
VERSION_OPT=${BASH_REMATCH[14]}
|
||||
# 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
|
||||
|
||||
|
||||
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
|
||||
# Check whether --with-version-pre was given.
|
||||
if test "${with_version_pre+set}" = set; then :
|
||||
withval=$with_version_pre; with_version_pre_present=true
|
||||
else
|
||||
with_version_pre_present=false
|
||||
fi
|
||||
|
||||
|
||||
if test "x$with_version_pre_present" = xtrue; then
|
||||
if test "x$with_version_pre" = xyes; then
|
||||
as_fn_error $? "--with-version-pre must have a value" "$LINENO" 5
|
||||
elif test "x$with_version_pre" = xno; then
|
||||
# Interpret --without-* as empty string instead of the literal "no"
|
||||
VERSION_PRE=
|
||||
else
|
||||
# Only [a-zA-Z] is allowed in the VERSION_PRE. Outer [ ] to quote m4.
|
||||
VERSION_PRE=`$ECHO "$with_version_pre" | $TR -c -d '[a-z][A-Z]'`
|
||||
if test "x$VERSION_PRE" != "x$with_version_pre"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-version-pre value has been sanitized from '$with_version_pre' to '$VERSION_PRE'" >&5
|
||||
$as_echo "$as_me: WARNING: --with-version-pre value has been sanitized from '$with_version_pre' to '$VERSION_PRE'" >&2;}
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is to use "internal" as pre
|
||||
VERSION_PRE="internal"
|
||||
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>.<username>.<base dir name>
|
||||
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-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_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
|
||||
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
|
||||
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is 0, if unspecified
|
||||
VERSION_MINOR=0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
# 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 VERSION_IS_GA based on if VERSION_PRE has a value
|
||||
if test "x$VERSION_PRE" = x; then
|
||||
VERSION_IS_GA=true
|
||||
else
|
||||
VERSION_IS_GA=false
|
||||
fi
|
||||
|
||||
# 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; }
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -21501,7 +21905,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -21697,7 +22101,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -21881,7 +22285,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -22064,7 +22468,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -22247,7 +22651,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -22421,7 +22825,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -22740,7 +23144,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -23065,7 +23469,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -23277,7 +23681,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -23454,7 +23858,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -23659,7 +24063,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -23836,7 +24240,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -24041,7 +24445,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -24218,7 +24622,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -24423,7 +24827,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -24600,7 +25004,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -24792,7 +25196,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -24967,7 +25371,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -25160,7 +25564,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -25335,7 +25739,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -25527,7 +25931,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -25702,7 +26106,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -25895,7 +26299,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -26070,7 +26474,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -26244,7 +26648,7 @@ $as_echo "$as_me: (This might be an JRE instead of an JDK)" >&6;}
|
||||
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
|
||||
|
||||
# Extra M4 quote needed to protect [] in grep expression.
|
||||
FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`
|
||||
FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`
|
||||
if test "x$FOUND_CORRECT_VERSION" = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&5
|
||||
$as_echo "$as_me: Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring" >&6;}
|
||||
@ -42309,13 +42713,13 @@ $as_echo "$tool_specified" >&6; }
|
||||
# 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)\" \
|
||||
-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
|
||||
|
||||
|
||||
@ -43444,10 +43848,6 @@ $as_echo "$supports" >&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"
|
||||
@ -53072,18 +53472,18 @@ fi
|
||||
|
||||
|
||||
|
||||
{ $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
|
||||
|
||||
|
||||
|
||||
@ -55211,6 +55611,7 @@ fi
|
||||
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"
|
||||
|
||||
@ -202,6 +202,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
|
||||
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"
|
||||
|
||||
@ -434,25 +434,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
|
||||
fi
|
||||
AC_SUBST(UNLIMITED_CRYPTO)
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
# 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)
|
||||
])
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
# Compress jars
|
||||
@ -460,85 +441,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
|
||||
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
|
||||
@ -549,16 +453,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
|
||||
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],
|
||||
@ -574,6 +468,26 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
|
||||
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],
|
||||
[
|
||||
#
|
||||
|
||||
321
common/autoconf/jdk-version.m4
Normal file
321
common/autoconf/jdk-version.m4
Normal file
@ -0,0 +1,321 @@
|
||||
#
|
||||
# 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
|
||||
AC_DEFUN([JDKVER_CHECK_AND_SET_NUMBER],
|
||||
[
|
||||
# Additional [] needed to keep m4 from mangling shell constructs.
|
||||
if [ ! [[ "$2" =~ ^0*([1-9][0-9]*)|(0)$ ]] ] ; then
|
||||
AC_MSG_ERROR(["$2" is not a valid numerical value for $1])
|
||||
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
|
||||
AC_MSG_ERROR([$1 is given as $2. This is greater than 255 which is not allowed.])
|
||||
fi
|
||||
if test "x$cleaned_value" != "x$2"; then
|
||||
AC_MSG_WARN([Value for $1 has been sanitized from '$2' to '$cleaned_value'])
|
||||
fi
|
||||
$1=$cleaned_value
|
||||
])
|
||||
|
||||
AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
|
||||
[
|
||||
# Warn user that old version arguments are deprecated.
|
||||
BASIC_DEPRECATED_ARG_WITH([milestone])
|
||||
BASIC_DEPRECATED_ARG_WITH([update-version])
|
||||
BASIC_DEPRECATED_ARG_WITH([user-release-suffix])
|
||||
BASIC_DEPRECATED_ARG_WITH([build-number])
|
||||
|
||||
# Source the version numbers file
|
||||
. $AUTOCONF_DIR/version-numbers
|
||||
|
||||
# Some non-version number information is set in that file
|
||||
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)
|
||||
|
||||
# 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.
|
||||
AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
|
||||
[Set version string @<:@calculated@:>@])])
|
||||
if test "x$with_version_string" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-string must have a value])
|
||||
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]+))?((\+)([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=${BASH_REMATCH[[9]]}
|
||||
version_plus_separator=${BASH_REMATCH[[11]]}
|
||||
VERSION_BUILD=${BASH_REMATCH[[12]]}
|
||||
VERSION_OPT=${BASH_REMATCH[[14]]}
|
||||
# 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
|
||||
AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' are missing])
|
||||
fi
|
||||
# Stop the version part process from setting default values.
|
||||
# We still allow them to explicitely override though.
|
||||
NO_DEFAULT_VERSION_PARTS=true
|
||||
else
|
||||
AC_MSG_ERROR([--with-version-string fails to parse as a valid version string: $with_version_string])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(version-pre, [AS_HELP_STRING([--with-version-pre],
|
||||
[Set the base part of the version 'PRE' field (pre-release identifier) @<:@'internal'@:>@])],
|
||||
[with_version_pre_present=true], [with_version_pre_present=false])
|
||||
|
||||
if test "x$with_version_pre_present" = xtrue; then
|
||||
if test "x$with_version_pre" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-pre must have a value])
|
||||
elif test "x$with_version_pre" = xno; then
|
||||
# Interpret --without-* as empty string instead of the literal "no"
|
||||
VERSION_PRE=
|
||||
else
|
||||
# Only [a-zA-Z] is allowed in the VERSION_PRE. Outer [ ] to quote m4.
|
||||
[ VERSION_PRE=`$ECHO "$with_version_pre" | $TR -c -d '[a-z][A-Z]'` ]
|
||||
if test "x$VERSION_PRE" != "x$with_version_pre"; then
|
||||
AC_MSG_WARN([--with-version-pre value has been sanitized from '$with_version_pre' to '$VERSION_PRE'])
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is to use "internal" as pre
|
||||
VERSION_PRE="internal"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(version-opt, [AS_HELP_STRING([--with-version-opt],
|
||||
[Set version 'OPT' field (build metadata) @<:@<timestamp>.<user>.<dirname>@:>@])],
|
||||
[with_version_opt_present=true], [with_version_opt_present=false])
|
||||
|
||||
if test "x$with_version_opt_present" = xtrue; then
|
||||
if test "x$with_version_opt" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-opt must have a value])
|
||||
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
|
||||
AC_MSG_WARN([--with-version-opt value has been sanitized from '$with_version_opt' to '$VERSION_OPT'])
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is to calculate a string like this <timestamp>.<username>.<base dir name>
|
||||
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
|
||||
|
||||
AC_ARG_WITH(version-build, [AS_HELP_STRING([--with-version-build],
|
||||
[Set version 'BUILD' field (build number) @<:@not specified@:>@])],
|
||||
[with_version_build_present=true], [with_version_build_present=false])
|
||||
|
||||
if test "x$with_version_build_present" = xtrue; then
|
||||
if test "x$with_version_build" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-build must have a value])
|
||||
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
|
||||
JDKVER_CHECK_AND_SET_NUMBER(VERSION_BUILD, $with_version_build)
|
||||
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
|
||||
|
||||
AC_ARG_WITH(version-major, [AS_HELP_STRING([--with-version-major],
|
||||
[Set version 'MAJOR' field (first number) @<:@current source value@:>@])],
|
||||
[with_version_major_present=true], [with_version_major_present=false])
|
||||
|
||||
if test "x$with_version_major_present" = xtrue; then
|
||||
if test "x$with_version_major" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-major must have a value])
|
||||
else
|
||||
JDKVER_CHECK_AND_SET_NUMBER(VERSION_MAJOR, $with_version_major)
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is to get value from version-numbers
|
||||
VERSION_MAJOR="$DEFAULT_VERSION_MAJOR"
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(version-minor, [AS_HELP_STRING([--with-version-minor],
|
||||
[Set version 'MINOR' field (second number) @<:@current source value@:>@])],
|
||||
[with_version_minor_present=true], [with_version_minor_present=false])
|
||||
|
||||
if test "x$with_version_minor_present" = xtrue; then
|
||||
if test "x$with_version_minor" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-minor must have a value])
|
||||
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
|
||||
JDKVER_CHECK_AND_SET_NUMBER(VERSION_MINOR, $with_version_minor)
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is 0, if unspecified
|
||||
VERSION_MINOR=0
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(version-security, [AS_HELP_STRING([--with-version-security],
|
||||
[Set version 'SECURITY' field (third number) @<:@current source value@:>@])],
|
||||
[with_version_security_present=true], [with_version_security_present=false])
|
||||
|
||||
if test "x$with_version_security_present" = xtrue; then
|
||||
if test "x$with_version_security" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-security must have a value])
|
||||
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
|
||||
JDKVER_CHECK_AND_SET_NUMBER(VERSION_SECURITY, $with_version_security)
|
||||
fi
|
||||
else
|
||||
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
|
||||
# Default is 0, if unspecified
|
||||
VERSION_SECURITY=0
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(version-patch, [AS_HELP_STRING([--with-version-patch],
|
||||
[Set version 'PATCH' field (fourth number) @<:@not specified@:>@])],
|
||||
[with_version_patch_present=true], [with_version_patch_present=false])
|
||||
|
||||
if test "x$with_version_patch_present" = xtrue; then
|
||||
if test "x$with_version_patch" = xyes; then
|
||||
AC_MSG_ERROR([--with-version-patch must have a value])
|
||||
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
|
||||
JDKVER_CHECK_AND_SET_NUMBER(VERSION_PATCH, $with_version_patch)
|
||||
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 VERSION_IS_GA based on if VERSION_PRE has a value
|
||||
if test "x$VERSION_PRE" = x; then
|
||||
VERSION_IS_GA=true
|
||||
else
|
||||
VERSION_IS_GA=false
|
||||
fi
|
||||
|
||||
# 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}
|
||||
|
||||
AC_MSG_CHECKING([for version string])
|
||||
AC_MSG_RESULT([$VERSION_STRING])
|
||||
|
||||
AC_SUBST(VERSION_MAJOR)
|
||||
AC_SUBST(VERSION_MINOR)
|
||||
AC_SUBST(VERSION_SECURITY)
|
||||
AC_SUBST(VERSION_PATCH)
|
||||
AC_SUBST(VERSION_PRE)
|
||||
AC_SUBST(VERSION_BUILD)
|
||||
AC_SUBST(VERSION_OPT)
|
||||
AC_SUBST(VERSION_NUMBER)
|
||||
AC_SUBST(VERSION_NUMBER_FOUR_POSITIONS)
|
||||
AC_SUBST(VERSION_STRING)
|
||||
AC_SUBST(VERSION_SHORT)
|
||||
AC_SUBST(VERSION_IS_GA)
|
||||
])
|
||||
@ -134,13 +134,53 @@ HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
|
||||
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@
|
||||
# A GA version is defined by the PRE string being empty. Rather than testing for
|
||||
# that, this variable defines it with true/false.
|
||||
VERSION_IS_GA := @VERSION_IS_GA@
|
||||
|
||||
# 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@
|
||||
@ -148,27 +188,9 @@ JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
|
||||
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@
|
||||
@ -674,8 +696,8 @@ SYMBOLS_IMAGE_SUBDIR:=symbols
|
||||
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)
|
||||
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -1,183 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
||||
options="$*"
|
||||
option="$1"
|
||||
|
||||
tmp=/tmp/test_builds.$$
|
||||
rm -f -r ${tmp}
|
||||
mkdir -p ${tmp}
|
||||
|
||||
errMessages=${tmp}/error_messages.txt
|
||||
|
||||
#######
|
||||
# Error function
|
||||
error() # message
|
||||
{
|
||||
echo "ERROR: $1" | tee -a ${errMessages}
|
||||
}
|
||||
# Check errors
|
||||
checkErrors()
|
||||
{
|
||||
if [ -s ${errMessages} ] ; then
|
||||
cat ${errMessages}
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
#######
|
||||
|
||||
os="`uname -s`"
|
||||
arch="`uname -p`"
|
||||
make=make
|
||||
|
||||
if [ "${os}" = "SunOS" ] ; then
|
||||
make=gmake
|
||||
export J7="/opt/java/jdk1.7.0"
|
||||
elif [ "${os}" = "Darwin" ] ; then
|
||||
export J7="/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home"
|
||||
elif [ "${os}" = "Linux" -a "${arch}" = "x86_64" ] ; then
|
||||
export J7="/usr/lib/jvm/java-7-openjdk-amd64/"
|
||||
else
|
||||
echo "What os/arch is this: ${os}/${arch}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Must have a jdk7
|
||||
if [ ! -d ${J7} ] ; then
|
||||
echo "No JDK7 found at: ${J7}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# What sources we use
|
||||
fromroot="http://hg.openjdk.java.net/build-infra/jdk8"
|
||||
|
||||
# Where we do it
|
||||
root="testbuilds"
|
||||
mkdir -p ${root}
|
||||
|
||||
# Three areas, last three are cloned from first to insure sameness
|
||||
t0=${root}/t0
|
||||
t1=${root}/t1
|
||||
t2=${root}/t2
|
||||
t3=${root}/t3
|
||||
repolist="${t0} ${t1} ${t2} ${t3}"
|
||||
|
||||
# Optional complete clobber
|
||||
if [ "${option}" = "clobber" ] ; then
|
||||
for i in ${repolist} ; do
|
||||
rm -f -r ${i}
|
||||
done
|
||||
fi
|
||||
|
||||
# Get top repos
|
||||
if [ ! -d ${t0}/.hg ] ; then
|
||||
rm -f -r ${t0}
|
||||
hg clone ${fromroot} ${t0}
|
||||
fi
|
||||
for i in ${t1} ${t2} ${t3} ; do
|
||||
if [ ! -d ${i}/.hg ] ; then
|
||||
hg clone ${t0} ${i}
|
||||
fi
|
||||
done
|
||||
|
||||
# Get repos updated
|
||||
for i in ${repolist} ; do
|
||||
( \
|
||||
set -e \
|
||||
&& cd ${i} \
|
||||
&& sh ./get_source.sh \
|
||||
|| error "Cannot get source" \
|
||||
) 2>&1 | tee ${i}.get_source.txt
|
||||
checkErrors
|
||||
done
|
||||
|
||||
# Optional clean
|
||||
if [ "${option}" = "clean" ] ; then
|
||||
for i in ${repolist} ; do
|
||||
rm -f -r ${i}/build
|
||||
rm -f -r ${i}/*/build
|
||||
rm -f -r ${i}/*/dist
|
||||
done
|
||||
fi
|
||||
|
||||
# Check changes on working set files
|
||||
for i in ${repolist} ; do
|
||||
( \
|
||||
set -e \
|
||||
&& cd ${i} \
|
||||
&& sh ./make/scripts/hgforest.sh status \
|
||||
|| error "Cannot check status" \
|
||||
) 2>&1 | tee ${i}.hg.status.txt
|
||||
checkErrors
|
||||
done
|
||||
|
||||
# Configure for build-infra building
|
||||
for i in ${t1} ${t2} ; do
|
||||
( \
|
||||
set -e \
|
||||
&& cd ${i}/common/makefiles \
|
||||
&& sh ../autoconf/configure --with-boot-jdk=${J7} \
|
||||
|| error "Cannot configure" \
|
||||
) 2>&1 | tee ${i}.config.txt
|
||||
checkErrors
|
||||
done
|
||||
|
||||
# Do build-infra builds
|
||||
for i in ${t1} ${t2} ; do
|
||||
( \
|
||||
set -e \
|
||||
&& cd ${i}/common/makefiles \
|
||||
&& ${make} \
|
||||
FULL_VERSION:=1.8.0-internal-b00 \
|
||||
JRE_RELEASE_VERSION:=1.8.0-internal-b00 \
|
||||
USER_RELEASE_SUFFIX:=compare \
|
||||
RELEASE:=1.8.0-internal \
|
||||
VERBOSE= \
|
||||
LIBARCH= \
|
||||
all images \
|
||||
|| error "Cannot build" \
|
||||
) 2>&1 | tee ${i}.build.txt
|
||||
checkErrors
|
||||
done
|
||||
|
||||
# Compare build-infra builds
|
||||
( \
|
||||
sh ${t0}/common/bin/compareimage.sh \
|
||||
${t1}/build/*/images/j2sdk-image \
|
||||
${t2}/build/*/images/j2sdk-image \
|
||||
|| error "Cannot compare" \
|
||||
) 2>&1 | tee ${root}/build-infra-comparison.txt
|
||||
checkErrors
|
||||
|
||||
# Do old build
|
||||
unset JAVA_HOME
|
||||
export ALT_BOOTDIR="${J7}"
|
||||
( \
|
||||
cd ${t3} \
|
||||
&& ${make} FULL_VERSION='"1.8.0-internal" sanity \
|
||||
|| error "Cannot sanity" \
|
||||
) 2>&1 | tee ${t3}.sanity.txt
|
||||
checkErrors
|
||||
( \
|
||||
cd ${t3} \
|
||||
&& ${make} \
|
||||
FULL_VERSION='"1.8.0-internal" \
|
||||
JRE_RELEASE_VERSION:=1.8.0-internal-b00 \
|
||||
USER_RELEASE_SUFFIX:=compare \
|
||||
RELEASE:=1.8.0-internal \
|
||||
|| error "Cannot build old way" \
|
||||
) 2>&1 | tee ${t3}.build.txt
|
||||
checkErrors
|
||||
|
||||
# Compare old build to build-infra build
|
||||
( \
|
||||
sh ${t0}/common/bin/compareimage.sh \
|
||||
${t3}/build/*/j2sdk-image \
|
||||
${t1}/build/*/images/j2sdk-image \
|
||||
|| error "Cannot compare" \
|
||||
) 2>&1 | tee ${root}/build-comparison.txt
|
||||
checkErrors
|
||||
|
||||
exit 0
|
||||
@ -1911,15 +1911,9 @@
|
||||
<Elem>IDE_ALT_BOOTDIR</Elem>
|
||||
</envVariables>
|
||||
<transientMacros>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>JRE_RELEASE_VERSION="version"</Elem>
|
||||
</transientMacros>
|
||||
</codeAssistance>
|
||||
<makefileType>
|
||||
@ -4534,7 +4528,6 @@
|
||||
flavor2="0">
|
||||
<ccTool>
|
||||
<preprocessorList>
|
||||
<Elem>JRE_RELEASE_VERSION="version"</Elem>
|
||||
</preprocessorList>
|
||||
</ccTool>
|
||||
</item>
|
||||
@ -4857,15 +4850,12 @@
|
||||
<preprocessorList>
|
||||
<Elem>AMD64</Elem>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>GAMMA</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_TYPE="gamma"</Elem>
|
||||
<Elem>LINK_INTO_LIBJVM</Elem>
|
||||
<Elem>PRODUCT</Elem>
|
||||
@ -5346,10 +5336,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -5399,10 +5385,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Finalizer.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -5429,10 +5411,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Array.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -5488,10 +5466,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Bits.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -5525,10 +5499,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="AccessController.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -5569,10 +5539,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -6141,10 +6107,6 @@
|
||||
<preprocessorList>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LINUX</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -6198,10 +6160,6 @@
|
||||
<preprocessorList>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LINUX</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -6577,10 +6535,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jdk_util_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -6623,10 +6577,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -6652,10 +6602,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -6711,10 +6657,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -7037,10 +6979,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -7135,15 +7073,9 @@
|
||||
<Elem>IDE_ALT_BOOTDIR</Elem>
|
||||
</envVariables>
|
||||
<transientMacros>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>JRE_RELEASE_VERSION="version"</Elem>
|
||||
</transientMacros>
|
||||
</codeAssistance>
|
||||
<makefileType>
|
||||
@ -9822,7 +9754,6 @@
|
||||
flavor2="0">
|
||||
<ccTool>
|
||||
<preprocessorList>
|
||||
<Elem>JRE_RELEASE_VERSION="version"</Elem>
|
||||
</preprocessorList>
|
||||
</ccTool>
|
||||
</item>
|
||||
@ -10483,10 +10414,7 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_NAME="openjdk"</Elem>
|
||||
<Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
|
||||
<Elem>PROGNAME="javac"</Elem>
|
||||
@ -11349,10 +11277,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="check_version.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11382,10 +11306,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jdk_util.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11415,10 +11335,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jio.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11448,10 +11364,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jni_util.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11481,10 +11393,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="verify_stub.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11569,10 +11477,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Class.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11602,10 +11506,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ClassLoader.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11635,10 +11535,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Compiler.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11668,10 +11564,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Double.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11701,10 +11593,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Float.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11734,10 +11622,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Object.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11767,10 +11651,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Package.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11800,10 +11680,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ResourceBundle.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11833,10 +11709,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Runtime.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11866,10 +11738,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="SecurityManager.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11899,10 +11767,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Shutdown.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11932,10 +11796,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="StrictMath.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11965,10 +11825,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="String.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -11998,10 +11854,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="System.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -12031,10 +11883,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Thread.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -12064,10 +11912,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Throwable.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -12804,10 +12648,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="TimeZone.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -20853,15 +20693,12 @@
|
||||
<preprocessorList>
|
||||
<Elem>AMD64</Elem>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>GAMMA</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_TYPE="gamma"</Elem>
|
||||
<Elem>LINK_INTO_LIBJVM</Elem>
|
||||
<Elem>LINUX</Elem>
|
||||
@ -20919,15 +20756,12 @@
|
||||
<preprocessorList>
|
||||
<Elem>AMD64</Elem>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>GAMMA</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_TYPE="gamma"</Elem>
|
||||
<Elem>LINK_INTO_LIBJVM</Elem>
|
||||
<Elem>LINUX</Elem>
|
||||
@ -21824,10 +21658,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -21877,10 +21707,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Finalizer.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -21907,10 +21733,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Array.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -21966,10 +21788,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Bits.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -22003,10 +21821,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="AccessController.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -22047,10 +21861,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -22619,10 +22429,6 @@
|
||||
<preprocessorList>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LINUX</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -22676,10 +22482,6 @@
|
||||
<preprocessorList>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LINUX</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -23055,10 +22857,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jdk_util_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -23101,10 +22899,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -23130,10 +22924,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -23189,10 +22979,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -23515,10 +23301,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="HostLocaleProviderAdapter_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -23613,15 +23395,9 @@
|
||||
<Elem>IDE_ALT_BOOTDIR</Elem>
|
||||
</envVariables>
|
||||
<transientMacros>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>JRE_RELEASE_VERSION="version"</Elem>
|
||||
</transientMacros>
|
||||
</codeAssistance>
|
||||
<makefileType>
|
||||
@ -27454,7 +27230,6 @@
|
||||
flavor2="0">
|
||||
<ccTool>
|
||||
<preprocessorList>
|
||||
<Elem>JRE_RELEASE_VERSION="version"</Elem>
|
||||
</preprocessorList>
|
||||
</ccTool>
|
||||
</item>
|
||||
@ -28130,11 +27905,8 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>HAVE_GETHRTIME</Elem>
|
||||
<Elem>JAVA_ARGS={ "-J-ms8m", "com.sun.tools.javac.Main", }</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_NAME="openjdk"</Elem>
|
||||
<Elem>NEVER_ACT_AS_SERVER_CLASS_MACHINE</Elem>
|
||||
<Elem>PROGNAME="javac"</Elem>
|
||||
@ -28961,10 +28733,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="check_version.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -28994,10 +28762,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jdk_util.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29027,10 +28791,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jio.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29060,10 +28820,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="jni_util.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29093,10 +28849,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="verify_stub.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29181,10 +28933,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Class.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29214,10 +28962,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ClassLoader.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29247,10 +28991,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Compiler.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29280,10 +29020,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Double.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29313,10 +29049,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Float.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29346,10 +29078,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Object.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29379,10 +29107,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Package.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29412,10 +29136,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ResourceBundle.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29445,10 +29165,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Runtime.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29478,10 +29194,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="SecurityManager.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29511,10 +29223,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Shutdown.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29544,10 +29252,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="StrictMath.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29577,10 +29281,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="String.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29610,10 +29310,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="System.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29643,10 +29339,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Thread.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -29676,10 +29368,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Throwable.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -30416,10 +30104,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="TimeZone.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -38550,15 +38234,12 @@
|
||||
<preprocessorList>
|
||||
<Elem>AMD64</Elem>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>GAMMA</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_TYPE="gamma"</Elem>
|
||||
<Elem>LINK_INTO_LIBJVM</Elem>
|
||||
<Elem>PRODUCT</Elem>
|
||||
@ -38723,15 +38404,12 @@
|
||||
<preprocessorList>
|
||||
<Elem>AMD64</Elem>
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>FULL_VERSION="version"</Elem>
|
||||
<Elem>GAMMA</Elem>
|
||||
<Elem>HOTSPOT_BUILD_TARGET="target"</Elem>
|
||||
<Elem>HOTSPOT_BUILD_USER="user"</Elem>
|
||||
<Elem>HOTSPOT_LIB_ARCH="amd64"</Elem>
|
||||
<Elem>HOTSPOT_RELEASE_VERSION="version"</Elem>
|
||||
<Elem>HOTSPOT_VM_DISTRO="OpenJDK"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>LAUNCHER_TYPE="gamma"</Elem>
|
||||
<Elem>LINK_INTO_LIBJVM</Elem>
|
||||
<Elem>PRODUCT</Elem>
|
||||
@ -39575,10 +39253,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -39628,10 +39302,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Finalizer.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -39658,10 +39328,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Array.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -39717,10 +39383,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="Bits.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -39754,10 +39416,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="AccessController.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -39798,10 +39456,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -40381,10 +40035,6 @@
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>BREAKPTS</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>MACRO_MEMSYS_OPS</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -40441,10 +40091,6 @@
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>BREAKPTS</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>MACRO_MEMSYS_OPS</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -40916,10 +40562,6 @@
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>BREAKPTS</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>MACRO_MEMSYS_OPS</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
@ -40986,10 +40628,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
</folder>
|
||||
@ -41015,10 +40653,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="ProcessEnvironment_md.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -41074,10 +40708,6 @@
|
||||
</incDir>
|
||||
<preprocessorList>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>THIS_FILE="FileSystemPreferences.c"</Elem>
|
||||
</preprocessorList>
|
||||
</cTool>
|
||||
@ -41528,10 +41158,6 @@
|
||||
<Elem>ARCH="amd64"</Elem>
|
||||
<Elem>ARCHPROPNAME="amd64"</Elem>
|
||||
<Elem>BREAKPTS</Elem>
|
||||
<Elem>JDK_BUILD_NUMBER="nn"</Elem>
|
||||
<Elem>JDK_MAJOR_VERSION="version"</Elem>
|
||||
<Elem>JDK_MICRO_VERSION="version"</Elem>
|
||||
<Elem>JDK_MINOR_VERSION="minor"</Elem>
|
||||
<Elem>MACRO_MEMSYS_OPS</Elem>
|
||||
<Elem>NDEBUG</Elem>
|
||||
<Elem>RELEASE=""</Elem>
|
||||
|
||||
@ -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 @@ endef
|
||||
|
||||
# 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
|
||||
|
||||
|
||||
@ -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 @@ default: install
|
||||
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.
|
||||
|
||||
108
make/Javadoc.gmk
108
make/Javadoc.gmk
@ -49,8 +49,6 @@ DOCSTMPDIR = $(SUPPORT_OUTPUTDIR)/docs
|
||||
|
||||
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_URL = http://bugreport.java.com/bugreport/
|
||||
BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
|
||||
|
||||
# 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 @@ endef
|
||||
|
||||
|
||||
|
||||
# Draft used for non-fcs documents
|
||||
DRAFT_HEADER =
|
||||
ifneq ($(MILESTONE), fcs)
|
||||
DRAFT_HEADER = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
|
||||
DRAFT_BOTTOM = <br><strong>DRAFT $(MILESTONE)-$(BUILD_NUMBER)</strong>
|
||||
DRAFT_WINTITLE = $(BUILD_NUMBER)
|
||||
# Assume we need a draft format when the version string is not a GA version.
|
||||
ifeq ($(VERSION_IS_GA), false)
|
||||
DRAFT_HEADER := <br><strong>DRAFT $(VERSION_STRING)</strong>
|
||||
DRAFT_BOTTOM := <br><strong>DRAFT $(VERSION_STRING)</strong>
|
||||
DRAFT_WINTITLE := $(VERSION_BUILD)
|
||||
# Early access top text (not used in FCS releases)
|
||||
COREAPI_TOP_EARLYACCESS = \
|
||||
COREAPI_TOP_EARLYACCESS := \
|
||||
<div style="background-color: \#EEEEEE"> \
|
||||
<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
|
||||
margin-left: 6px; margin-right: 6px; text-align: justify; \
|
||||
@ -331,7 +325,11 @@ contained herein are not final and are subject to change. \
|
||||
The information is being made available to you solely for purpose of \
|
||||
evaluation. \
|
||||
</div> </div>
|
||||
|
||||
else
|
||||
DRAFT_HEADER :=
|
||||
DRAFT_BOTTOM :=
|
||||
DRAFT_WINTITLE :=
|
||||
COREAPI_TOP_EARLYACCESS :=
|
||||
endif
|
||||
|
||||
#################################################################
|
||||
@ -351,39 +349,15 @@ $(eval $(call IncludeCustomExtension, , Javadoc.gmk))
|
||||
all: docs
|
||||
docs: coredocs otherdocs
|
||||
|
||||
#################################################################
|
||||
# Production Targets -- USE THESE TARGETS WHEN:
|
||||
# a) You're generating docs outside of release engineering's
|
||||
# standard control build.
|
||||
# b) The docs will be pushed to the web and/or included in
|
||||
# the downloaded doc bundle.
|
||||
#
|
||||
# See: Notes.html#releaseTargets
|
||||
# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
|
||||
#
|
||||
|
||||
sanitycheckcoredocs:
|
||||
@$(ECHO) ""
|
||||
@$(ECHO) "Building core api docs with these values:"
|
||||
@$(ECHO) " BUILD_NUMBER = $(BUILD_NUMBER)"
|
||||
@$(ECHO) " MILESTONE = $(MILESTONE)"
|
||||
@$(ECHO) ""
|
||||
ifeq ($(BUILD_NUMBER), b00)
|
||||
@$(ECHO) "ERROR: Build number must be defined"
|
||||
@$(ECHO) "MILESTONE is set to $(MILESTONE)"
|
||||
@$(ECHO) ""
|
||||
exit 1
|
||||
endif
|
||||
|
||||
#############################################################
|
||||
#
|
||||
# coredocs
|
||||
#
|
||||
COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
|
||||
$(JDK_MINOR_VERSION)<br>API Specification
|
||||
COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
|
||||
$(VERSION_SPECIFICATION)<br>API Specification
|
||||
COREAPI_WINDOWTITLE = Java Platform SE $(VERSION_SPECIFICATION)
|
||||
COREAPI_HEADER = \
|
||||
<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(JDK_MINOR_VERSION)</strong>
|
||||
<strong>Java$(TRADEMARK) Platform<br>Standard Ed. $(VERSION_SPECIFICATION)</strong>
|
||||
|
||||
# Overview file for core apis
|
||||
COREAPI_OVERVIEW = $(JDK_TOPDIR)/src/java.base/share/classes/overview-core.html
|
||||
@ -1338,55 +1312,9 @@ $(JDKNET_PACKAGES_FILE): $(call PackageDependencies,$(JDKNET_PKGS))
|
||||
$(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=<value>
|
||||
# * 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)
|
||||
|
||||
@ -35,7 +35,8 @@ $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
|
||||
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) , \
|
||||
))
|
||||
|
||||
|
||||
@ -38,11 +38,11 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
|
||||
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
|
||||
|
||||
@ -90,9 +90,10 @@ jprt.jbb.options=-Djava.awt.headless=true
|
||||
# Configure args common to all builds
|
||||
# Also allows for additional, testset specific configure arguments to be set
|
||||
jprt.build.configure.args= \
|
||||
--with-output-sync=recurse \
|
||||
--with-boot-jdk=$ALT_BOOTDIR \
|
||||
--with-jobs=$ALT_PARALLEL_COMPILE_JOBS \
|
||||
--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}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user