stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
David Katleman 2013-06-04 15:54:46 -07:00
commit 227dc3c228
10 changed files with 339 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/autoconf/basics.m4
View File

@ -72,7 +72,7 @@ AC_DEFUN([BASIC_FIXUP_PATH],
AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
fi fi
$1="`cd "$path"; $THEPWDCMD`" $1="`cd "$path"; $THEPWDCMD -L`"
fi fi
]) ])
@ -169,10 +169,10 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME [$]$1` sym_link_dir=`$DIRNAME [$]$1`
sym_link_file=`$BASENAME [$]$1` sym_link_file=`$BASENAME [$]$1`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir cd $sym_link_dir
cd `$THEPWDCMD` # Use -P flag to resolve symlinks in directories.
sym_link_dir=`$THEPWDCMD` cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks # Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -183,7 +183,7 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
# Again resolve directory symlinks since the target of the just found # Again resolve directory symlinks since the target of the just found
# link could be in a different directory # link could be in a different directory
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1 let COUNTER=COUNTER+1
done done
@ -264,7 +264,6 @@ BASIC_REQUIRE_PROG(MKDIR, mkdir)
BASIC_REQUIRE_PROG(MKTEMP, mktemp) BASIC_REQUIRE_PROG(MKTEMP, mktemp)
BASIC_REQUIRE_PROG(MV, mv) BASIC_REQUIRE_PROG(MV, mv)
BASIC_REQUIRE_PROG(PRINTF, printf) BASIC_REQUIRE_PROG(PRINTF, printf)
BASIC_REQUIRE_PROG(THEPWDCMD, pwd)
BASIC_REQUIRE_PROG(RM, rm) BASIC_REQUIRE_PROG(RM, rm)
BASIC_REQUIRE_PROG(SH, sh) BASIC_REQUIRE_PROG(SH, sh)
BASIC_REQUIRE_PROG(SORT, sort) BASIC_REQUIRE_PROG(SORT, sort)
@ -297,6 +296,10 @@ BASIC_CHECK_NONEMPTY(NAWK)
# Always force rm. # Always force rm.
RM="$RM -f" RM="$RM -f"
# pwd behaves differently on various platforms and some don't support the -L flag.
# Always use the bash builtin pwd to get uniform behavior.
THEPWDCMD=pwd
# These are not required on all platforms # These are not required on all platforms
AC_PATH_PROG(CYGPATH, cygpath) AC_PATH_PROG(CYGPATH, cygpath)
AC_PATH_PROG(READLINK, readlink) AC_PATH_PROG(READLINK, readlink)
@ -309,13 +312,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
[ [
# Locate the directory of this script. # Locate the directory of this script.
SCRIPT="[$]0" SCRIPT="[$]0"
BASIC_REMOVE_SYMBOLIC_LINKS(SCRIPT) AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
# Where is the source? It is located two levels above the configure script. # Where is the source? It is located two levels above the configure script.
CURDIR="$PWD" CURDIR="$PWD"
cd "$AUTOCONF_DIR/../.." cd "$AUTOCONF_DIR/../.."
SRC_ROOT="`$THEPWDCMD`" SRC_ROOT="`$THEPWDCMD -L`"
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
PATH_SEP=";" PATH_SEP=";"
@ -374,13 +376,9 @@ AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
[ CONF_NAME=${with_conf_name} ]) [ CONF_NAME=${with_conf_name} ])
# Test from where we are running configure, in or outside of src root. # Test from where we are running configure, in or outside of src root.
# To enable comparison of directories, CURDIR needs to be symlink free if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
# just like SRC_ROOT already is || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
NOSYM_CURDIR="$CURDIR" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
BASIC_REMOVE_SYMBOLIC_LINKS(NOSYM_CURDIR)
if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
|| test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
|| test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
# We are running configure from the src root. # We are running configure from the src root.
# Create a default ./build/target-variant-debuglevel output root. # Create a default ./build/target-variant-debuglevel output root.
if test "x${CONF_NAME}" = x; then if test "x${CONF_NAME}" = x; then
@ -617,6 +615,20 @@ fi
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
BASIC_REQUIRE_PROG(XATTR, xattr) BASIC_REQUIRE_PROG(XATTR, xattr)
AC_PATH_PROG(CODESIGN, codesign)
if test "x$CODESIGN" != "x"; then
# Verify that the openjdk_codesign certificate is present
AC_MSG_CHECKING([if openjdk_codesign certificate is present])
rm -f codesign-testfile
touch codesign-testfile
codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
rm -f codesign-testfile
if test "x$CODESIGN" = x; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
fi
fi
fi fi
]) ])

2
common/autoconf/basics_windows.m4
View File

@ -300,7 +300,7 @@ AC_DEFUN([BASIC_FIXUP_EXECUTABLE_MSYS],
# Setup basic configuration paths, and platform-specific stuff related to PATHs. # Setup basic configuration paths, and platform-specific stuff related to PATHs.
AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS], AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS],
[ [
SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m` SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
if test $SRC_ROOT_LENGTH -gt 100; then if test $SRC_ROOT_LENGTH -gt 100; then
AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported]) AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
fi fi

3
common/autoconf/build-performance.m4
View File

@ -145,6 +145,9 @@ AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS],
if test "$JOBS" -gt "16"; then if test "$JOBS" -gt "16"; then
JOBS=16 JOBS=16
fi fi
if test "$JOBS" -eq "0"; then
JOBS=1
fi
AC_MSG_RESULT([$JOBS]) AC_MSG_RESULT([$JOBS])
else else
JOBS=$with_jobs JOBS=$with_jobs

461
common/autoconf/generated-configure.sh
View File

@ -681,8 +681,8 @@ STATIC_LIBRARY
SHARED_LIBRARY SHARED_LIBRARY
OBJ_SUFFIX OBJ_SUFFIX
COMPILER_NAME COMPILER_NAME
JTREGEXE
JT_HOME JT_HOME
JTREGEXE
LIPO LIPO
ac_ct_OBJDUMP ac_ct_OBJDUMP
OBJDUMP OBJDUMP
@ -797,6 +797,7 @@ OS_VERSION_MICRO
OS_VERSION_MINOR OS_VERSION_MINOR
OS_VERSION_MAJOR OS_VERSION_MAJOR
PKG_CONFIG PKG_CONFIG
CODESIGN
XATTR XATTR
TIME TIME
STAT STAT
@ -900,7 +901,6 @@ TAIL
SORT SORT
SH SH
RM RM
THEPWDCMD
PRINTF PRINTF
MV MV
MKTEMP MKTEMP
@ -988,6 +988,7 @@ enable_hotspot_test_in_build
with_cacerts_file with_cacerts_file
enable_unlimited_crypto enable_unlimited_crypto
with_milestone with_milestone
with_update_version
with_build_number with_build_number
with_user_release_suffix with_user_release_suffix
with_boot_jdk with_boot_jdk
@ -1727,6 +1728,7 @@ Optional Packages:
group group
--with-cacerts-file specify alternative cacerts file --with-cacerts-file specify alternative cacerts file
--with-milestone Set milestone value for build [internal] --with-milestone Set milestone value for build [internal]
--with-update-version Set update version value for build [b00]
--with-build-number Set build number value for build [b00] --with-build-number Set build number value for build [b00]
--with-user-release-suffix --with-user-release-suffix
Add a custom string to the version string if build Add a custom string to the version string if build
@ -3780,7 +3782,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1369764185 DATE_WHEN_GENERATED=1370334570
############################################################################### ###############################################################################
# #
@ -5169,65 +5171,6 @@ $as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
for ac_prog in pwd
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $THEPWDCMD in
[\\/]* | ?:[\\/]*)
ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
THEPWDCMD=$ac_cv_path_THEPWDCMD
if test -n "$THEPWDCMD"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
$as_echo "$THEPWDCMD" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$THEPWDCMD" && break
done
if test "x$THEPWDCMD" = x; then
if test "xpwd" = x; then
PROG_NAME=thepwdcmd
else
PROG_NAME=pwd
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
as_fn_error $? "Cannot continue" "$LINENO" 5
fi
for ac_prog in rm for ac_prog in rm
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
@ -6426,6 +6369,10 @@ $as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
# Always force rm. # Always force rm.
RM="$RM -f" RM="$RM -f"
# pwd behaves differently on various platforms and some don't support the -L flag.
# Always use the bash builtin pwd to get uniform behavior.
THEPWDCMD=pwd
# These are not required on all platforms # These are not required on all platforms
# Extract the first word of "cygpath", so it can be a program name with args. # Extract the first word of "cygpath", so it can be a program name with args.
set dummy cygpath; ac_word=$2 set dummy cygpath; ac_word=$2
@ -7133,65 +7080,17 @@ $as_echo "$COMPILE_TYPE" >&6; }
# Locate the directory of this script. # Locate the directory of this script.
SCRIPT="$0" SCRIPT="$0"
AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
if test "x$OPENJDK_BUILD_OS" != xwindows; then
# Follow a chain of symbolic links. Use readlink
# where it exists, else fall back to horribly
# complicated shell code.
if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then
# A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there?
READLINK_TESTED=yes
READLINK=
fi
fi
if test "x$READLINK" != x; then
SCRIPT=`$READLINK -f $SCRIPT`
else
# Save the current directory for restoring afterwards
STARTDIR=$PWD
COUNTER=0
sym_link_dir=`$DIRNAME $SCRIPT`
sym_link_file=`$BASENAME $SCRIPT`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done!
break
fi
# Again resolve directory symlinks since the target of the just found
# link could be in a different directory
cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1
done
cd $STARTDIR
SCRIPT=$sym_link_dir/$sym_link_file
fi
fi
AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
# Where is the source? It is located two levels above the configure script. # Where is the source? It is located two levels above the configure script.
CURDIR="$PWD" CURDIR="$PWD"
cd "$AUTOCONF_DIR/../.." cd "$AUTOCONF_DIR/../.."
SRC_ROOT="`$THEPWDCMD`" SRC_ROOT="`$THEPWDCMD -L`"
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
PATH_SEP=";" PATH_SEP=";"
SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m` SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
if test $SRC_ROOT_LENGTH -gt 100; then if test $SRC_ROOT_LENGTH -gt 100; then
as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5 as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
fi fi
@ -7407,7 +7306,7 @@ $as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
SRC_ROOT="`cd "$path"; $THEPWDCMD`" SRC_ROOT="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -7529,7 +7428,7 @@ $as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid."
as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
CURDIR="`cd "$path"; $THEPWDCMD`" CURDIR="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -7900,60 +7799,9 @@ fi
# Test from where we are running configure, in or outside of src root. # Test from where we are running configure, in or outside of src root.
# To enable comparison of directories, CURDIR needs to be symlink free if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
# just like SRC_ROOT already is || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
NOSYM_CURDIR="$CURDIR" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
if test "x$OPENJDK_BUILD_OS" != xwindows; then
# Follow a chain of symbolic links. Use readlink
# where it exists, else fall back to horribly
# complicated shell code.
if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then
# A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there?
READLINK_TESTED=yes
READLINK=
fi
fi
if test "x$READLINK" != x; then
NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
else
# Save the current directory for restoring afterwards
STARTDIR=$PWD
COUNTER=0
sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
sym_link_file=`$BASENAME $NOSYM_CURDIR`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir
cd `$THEPWDCMD`
sym_link_dir=`$THEPWDCMD`
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done!
break
fi
# Again resolve directory symlinks since the target of the just found
# link could be in a different directory
cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD`
sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1
done
cd $STARTDIR
NOSYM_CURDIR=$sym_link_dir/$sym_link_file
fi
fi
if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
|| test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
|| test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
# We are running configure from the src root. # We are running configure from the src root.
# Create a default ./build/target-variant-debuglevel output root. # Create a default ./build/target-variant-debuglevel output root.
if test "x${CONF_NAME}" = x; then if test "x${CONF_NAME}" = x; then
@ -8128,7 +7976,7 @@ $as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is inval
as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`" OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -10493,6 +10341,62 @@ $as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
fi fi
# Extract the first word of "codesign", so it can be a program name with args.
set dummy codesign; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_CODESIGN+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $CODESIGN in
[\\/]* | ?:[\\/]*)
ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
CODESIGN=$ac_cv_path_CODESIGN
if test -n "$CODESIGN"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
$as_echo "$CODESIGN" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$CODESIGN" != "x"; then
# Verify that the openjdk_codesign certificate is present
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
$as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
rm -f codesign-testfile
touch codesign-testfile
codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
rm -f codesign-testfile
if test "x$CODESIGN" = x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
fi
fi fi
@ -10939,6 +10843,18 @@ if test "x$MILESTONE" = x; then
fi 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"
fi
# Check whether --with-build-number was given. # Check whether --with-build-number was given.
if test "${with_build_number+set}" = set; then : if test "${with_build_number+set}" = set; then :
withval=$with_build_number; withval=$with_build_number;
@ -11188,7 +11104,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -11520,7 +11436,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -11666,7 +11582,7 @@ $as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\",
as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`" JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
fi fi
if test ! -d "$JAVA_HOME_PROCESSED"; then if test ! -d "$JAVA_HOME_PROCESSED"; then
@ -11838,7 +11754,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -12026,7 +11942,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -12165,10 +12081,10 @@ fi
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $BINARY` sym_link_dir=`$DIRNAME $BINARY`
sym_link_file=`$BASENAME $BINARY` sym_link_file=`$BASENAME $BINARY`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir cd $sym_link_dir
cd `$THEPWDCMD` # Use -P flag to resolve symlinks in directories.
sym_link_dir=`$THEPWDCMD` cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks # Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -12179,7 +12095,7 @@ fi
# Again resolve directory symlinks since the target of the just found # Again resolve directory symlinks since the target of the just found
# link could be in a different directory # link could be in a different directory
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1 let COUNTER=COUNTER+1
done done
@ -12354,7 +12270,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -12569,7 +12485,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -12749,7 +12665,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -12957,7 +12873,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -13137,7 +13053,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -13345,7 +13261,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -13525,7 +13441,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -13733,7 +13649,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -13913,7 +13829,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -14108,7 +14024,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -14286,7 +14202,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -14482,7 +14398,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -14660,7 +14576,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -14855,7 +14771,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -15033,7 +14949,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -15229,7 +15145,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -15407,7 +15323,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -15584,7 +15500,7 @@ $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid.
as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
BOOT_JDK="`cd "$path"; $THEPWDCMD`" BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
@ -16261,14 +16177,28 @@ AR_OUT_OPTION='rcs$(SPACE)'
# Check whether --with-jtreg was given. # Check whether --with-jtreg was given.
if test "${with_jtreg+set}" = set; then : if test "${with_jtreg+set}" = set; then :
withval=$with_jtreg; withval=$with_jtreg;
else
with_jtreg=no
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTReg Regression Test Harness" >&5 if test "x$with_jtreg" = xno; then
$as_echo_n "checking for JTReg Regression Test Harness... " >&6; } # jtreg disabled
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
$as_echo_n "checking for jtreg... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
else
if test "x$with_jtreg" != xyes; then
# with path specified.
JT_HOME="$with_jtreg"
fi
if test "x$with_jtreg" != x; then if test "x$JT_HOME" != x; then
JT_HOME="$with_jtreg" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
$as_echo_n "checking for jtreg... " >&6; }
# use JT_HOME enviroment var.
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
@ -16388,20 +16318,82 @@ $as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid."
as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
JT_HOME="`cd "$path"; $THEPWDCMD`" JT_HOME="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5
$as_echo "$JT_HOME" >&6; }
# jtreg win32 script works for everybody # jtreg win32 script works for everybody
JTREGEXE="$JT_HOME/win32/bin/jtreg" JTREGEXE="$JT_HOME/win32/bin/jtreg"
if test ! -f "$JTREGEXE"; then
as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5 if test ! -f "$JTREGEXE"; then
fi as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
else fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
$as_echo "$JTREGEXE" >&6; }
else
# try to find jtreg on path
for ac_prog in jtreg
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_JTREGEXE+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $JTREGEXE in
[\\/]* | ?:[\\/]*)
ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
JTREGEXE=$ac_cv_path_JTREGEXE
if test -n "$JTREGEXE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
$as_echo "$JTREGEXE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi
test -n "$JTREGEXE" && break
done
if test "x$JTREGEXE" = x; then
if test "xjtreg" = x; then
PROG_NAME=jtregexe
else
PROG_NAME=jtreg
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
as_fn_error $? "Cannot continue" "$LINENO" 5
fi
JT_HOME="`$DIRNAME $JTREGEXE`"
fi
fi fi
@ -17377,7 +17369,7 @@ $as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid
as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
MSVCR_DLL="`cd "$path"; $THEPWDCMD`" MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -17534,7 +17526,7 @@ $as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invali
as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
dxsdk_path="`cd "$path"; $THEPWDCMD`" dxsdk_path="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -17672,7 +17664,7 @@ $as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is in
as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`" DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -17808,7 +17800,7 @@ $as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", i
as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`" DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
fi fi
@ -19395,10 +19387,10 @@ $as_echo_n "checking resolved symbolic links for CC... " >&6; }
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $TEST_COMPILER` sym_link_dir=`$DIRNAME $TEST_COMPILER`
sym_link_file=`$BASENAME $TEST_COMPILER` sym_link_file=`$BASENAME $TEST_COMPILER`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir cd $sym_link_dir
cd `$THEPWDCMD` # Use -P flag to resolve symlinks in directories.
sym_link_dir=`$THEPWDCMD` cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks # Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -19409,7 +19401,7 @@ $as_echo_n "checking resolved symbolic links for CC... " >&6; }
# Again resolve directory symlinks since the target of the just found # Again resolve directory symlinks since the target of the just found
# link could be in a different directory # link could be in a different directory
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1 let COUNTER=COUNTER+1
done done
@ -19832,10 +19824,10 @@ $as_echo_n "checking for resolved symbolic links for CC... " >&6; }
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC` sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
sym_link_file=`$BASENAME $PROPER_COMPILER_CC` sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir cd $sym_link_dir
cd `$THEPWDCMD` # Use -P flag to resolve symlinks in directories.
sym_link_dir=`$THEPWDCMD` cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks # Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -19846,7 +19838,7 @@ $as_echo_n "checking for resolved symbolic links for CC... " >&6; }
# Again resolve directory symlinks since the target of the just found # Again resolve directory symlinks since the target of the just found
# link could be in a different directory # link could be in a different directory
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1 let COUNTER=COUNTER+1
done done
@ -20968,10 +20960,10 @@ $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $TEST_COMPILER` sym_link_dir=`$DIRNAME $TEST_COMPILER`
sym_link_file=`$BASENAME $TEST_COMPILER` sym_link_file=`$BASENAME $TEST_COMPILER`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir cd $sym_link_dir
cd `$THEPWDCMD` # Use -P flag to resolve symlinks in directories.
sym_link_dir=`$THEPWDCMD` cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks # Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -20982,7 +20974,7 @@ $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
# Again resolve directory symlinks since the target of the just found # Again resolve directory symlinks since the target of the just found
# link could be in a different directory # link could be in a different directory
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1 let COUNTER=COUNTER+1
done done
@ -21405,10 +21397,10 @@ $as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
COUNTER=0 COUNTER=0
sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX` sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
sym_link_file=`$BASENAME $PROPER_COMPILER_CXX` sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
# Use the system pwd and not the shell builtin to resolve directory symlinks
cd $sym_link_dir cd $sym_link_dir
cd `$THEPWDCMD` # Use -P flag to resolve symlinks in directories.
sym_link_dir=`$THEPWDCMD` cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks # Resolve file symlinks
while test $COUNTER -lt 20; do while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'` ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
@ -21419,7 +21411,7 @@ $as_echo_n "checking for resolved symbolic links for CXX... " >&6; }
# Again resolve directory symlinks since the target of the just found # Again resolve directory symlinks since the target of the just found
# link could be in a different directory # link could be in a different directory
cd `$DIRNAME $ISLINK` cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD` sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK` sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1 let COUNTER=COUNTER+1
done done
@ -31131,7 +31123,7 @@ $as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is inv
as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
with_freetype="`cd "$path"; $THEPWDCMD`" with_freetype="`cd "$path"; $THEPWDCMD -L`"
fi fi
FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype" FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
@ -31433,7 +31425,7 @@ $as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is
as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5 as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
fi fi
FREETYPELOCATION="`cd "$path"; $THEPWDCMD`" FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
@ -32933,6 +32925,9 @@ $as_echo_n "checking for appropriate number of jobs to run in parallel... " >&6;
if test "$JOBS" -gt "16"; then if test "$JOBS" -gt "16"; then
JOBS=16 JOBS=16
fi fi
if test "$JOBS" -eq "0"; then
JOBS=1
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
$as_echo "$JOBS" >&6; } $as_echo "$JOBS" >&6; }
else else

8
common/autoconf/jdk-options.m4
View File

@ -422,6 +422,14 @@ if test "x$MILESTONE" = x; then
MILESTONE=internal MILESTONE=internal
fi 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"
fi
AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
[Set build number value for build @<:@b00@:>@])]) [Set build number value for build @<:@b00@:>@])])
if test "x$with_build_number" = xyes; then if test "x$with_build_number" = xyes; then

1
common/autoconf/spec.gmk.in
View File

@ -478,6 +478,7 @@ CCACHE:=@CCACHE@
# CD is going away, but remains to cater for legacy makefiles. # CD is going away, but remains to cater for legacy makefiles.
CD:=cd CD:=cd
CHMOD:=@CHMOD@ CHMOD:=@CHMOD@
CODESIGN:=@CODESIGN@
COMM:=@COMM@ COMM:=@COMM@
CP:=@CP@ CP:=@CP@
CPIO:=@CPIO@ CPIO:=@CPIO@

97
common/autoconf/toolchain.m4
View File

@ -36,7 +36,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION],
$ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null $ECHO $COMPILER_VERSION_TEST | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null
if test $? -ne 0; then if test $? -ne 0; then
GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1` GCC_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler.]) AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required Sun Studio compiler.])
AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_TEST" and with --version: "$GCC_VERSION_TEST"]) AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_TEST" and with --version: "$GCC_VERSION_TEST"])
AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.]) AC_MSG_ERROR([Sun Studio compiler is required. Try setting --with-tools-dir.])
@ -69,7 +69,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION],
AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"]) AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_TEST"])
AC_MSG_ERROR([GCC compiler is required. Try setting --with-tools-dir.]) AC_MSG_ERROR([GCC compiler is required. Try setting --with-tools-dir.])
fi fi
# First line typically looks something like: # First line typically looks something like:
# gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 # gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2
COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/p"` COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/p"`
@ -142,7 +142,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER) BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
AC_MSG_RESULT([$TEST_COMPILER]) AC_MSG_RESULT([$TEST_COMPILER])
AC_MSG_CHECKING([if $1 is disguised ccache]) AC_MSG_CHECKING([if $1 is disguised ccache])
COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"` COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
if test "x$COMPILER_BASENAME" = "xccache"; then if test "x$COMPILER_BASENAME" = "xccache"; then
AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler]) AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
@ -226,11 +226,11 @@ BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
], ],
[]) [])
if test "x$SYS_ROOT" != "x/" ; then if test "x$SYS_ROOT" != "x/" ; then
CFLAGS="--sysroot=$SYS_ROOT $CFLAGS" CFLAGS="--sysroot=$SYS_ROOT $CFLAGS"
CXXFLAGS="--sysroot=$SYS_ROOT $CXXFLAGS" CXXFLAGS="--sysroot=$SYS_ROOT $CXXFLAGS"
OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" OBJCFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS"
OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS" OBJCXXFLAGS="--sysroot=$SYS_ROOT $OBJCFLAGS"
CPPFLAGS="--sysroot=$SYS_ROOT $CPPFLAGS" CPPFLAGS="--sysroot=$SYS_ROOT $CPPFLAGS"
LDFLAGS="--sysroot=$SYS_ROOT $LDFLAGS" LDFLAGS="--sysroot=$SYS_ROOT $LDFLAGS"
fi fi
@ -330,7 +330,7 @@ AC_SUBST(HOTSPOT_LD)
COMPILER_NAME=gcc COMPILER_NAME=gcc
COMPILER_TYPE=CC COMPILER_TYPE=CC
AS_IF([test "x$OPENJDK_TARGET_OS" = xwindows], [ AS_IF([test "x$OPENJDK_TARGET_OS" = xwindows], [
# For now, assume that we are always compiling using cl.exe. # For now, assume that we are always compiling using cl.exe.
CC_OUT_OPTION=-Fo CC_OUT_OPTION=-Fo
EXE_OUT_OPTION=-out: EXE_OUT_OPTION=-out:
LD_OUT_OPTION=-out: LD_OUT_OPTION=-out:
@ -491,7 +491,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS],
############################################################################### ###############################################################################
# #
# How to compile shared libraries. # How to compile shared libraries.
# #
if test "x$GCC" = xyes; then if test "x$GCC" = xyes; then
@ -525,7 +525,7 @@ if test "x$GCC" = xyes; then
SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG" SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
SHARED_LIBRARY_SUFFIX='.dylib' SHARED_LIBRARY_SUFFIX='.dylib'
EXE_SUFFIX='' EXE_SUFFIX=''
SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1' SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_MAPFILE=''
SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN" SET_EXECUTABLE_ORIGIN="$SET_SHARED_LIBRARY_ORIGIN"
@ -676,7 +676,7 @@ case $COMPILER_TYPE in
# Use single precision floating point with 'float' # Use single precision floating point with 'float'
CC_HIGHEST="$CC_HIGHEST -fsingle" CC_HIGHEST="$CC_HIGHEST -fsingle"
# Assume memory references via basic pointer types do not alias # Assume memory references via basic pointer types do not alias
# (Source with excessing pointer casting and data access with mixed # (Source with excessing pointer casting and data access with mixed
# pointer types are not recommended) # pointer types are not recommended)
CC_HIGHEST="$CC_HIGHEST -xalias_level=basic" CC_HIGHEST="$CC_HIGHEST -xalias_level=basic"
# Use intrinsic or inline versions for math/std functions # Use intrinsic or inline versions for math/std functions
@ -892,7 +892,7 @@ if test "x$OPENJDK_TARGET_OS" = xsolaris; then
fi fi
if test "x$OPENJDK_TARGET_OS" = xmacosx; then if test "x$OPENJDK_TARGET_OS" = xmacosx; then
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
# Setting these parameters makes it an error to link to macosx APIs that are # Setting these parameters makes it an error to link to macosx APIs that are
# newer than the given OS version and makes the linked binaries compatible even # newer than the given OS version and makes the linked binaries compatible even
# if built on a newer version of the OS. # if built on a newer version of the OS.
# The expected format is X.Y.Z # The expected format is X.Y.Z
@ -940,12 +940,12 @@ CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
# Which should we link to? Are we lucky enough that the binary api to the libjvm.so library # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
# is identical for client and server? Yes. Which is picked at runtime (client or server)? # is identical for client and server? Yes. Which is picked at runtime (client or server)?
# Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
# libraries will link to whatever is in memory. Yuck. # libraries will link to whatever is in memory. Yuck.
# #
# Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh. # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
if test "x$COMPILER_NAME" = xcl; then if test "x$COMPILER_NAME" = xcl; then
LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no" LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
if test "x$OPENJDK_TARGET_CPU" = xx86; then if test "x$OPENJDK_TARGET_CPU" = xx86; then
LDFLAGS_JDK="$LDFLAGS_JDK -safeseh" LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
fi fi
# TODO: make -debug optional "--disable-full-debug-symbols" # TODO: make -debug optional "--disable-full-debug-symbols"
@ -965,7 +965,7 @@ else
if test -n "$HAS_GNU_HASH"; then if test -n "$HAS_GNU_HASH"; then
LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both " LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
fi fi
if test "x$OPENJDK_TARGET_OS" = xlinux; then if test "x$OPENJDK_TARGET_OS" = xlinux; then
# And since we now know that the linker is gnu, then add -z defs, to forbid # And since we now know that the linker is gnu, then add -z defs, to forbid
# undefined symbols in object files. # undefined symbols in object files.
LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs" LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs"
@ -1006,7 +1006,7 @@ fi
# Adjust flags according to debug level. # Adjust flags according to debug level.
case $DEBUG_LEVEL in case $DEBUG_LEVEL in
fastdebug ) fastdebug )
CFLAGS="$CFLAGS $D_FLAG" CFLAGS="$CFLAGS $D_FLAG"
JAVAC_FLAGS="$JAVAC_FLAGS -g" JAVAC_FLAGS="$JAVAC_FLAGS -g"
;; ;;
@ -1018,9 +1018,9 @@ case $DEBUG_LEVEL in
CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE" CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
JAVAC_FLAGS="$JAVAC_FLAGS -g" JAVAC_FLAGS="$JAVAC_FLAGS -g"
;; ;;
esac esac
AC_SUBST(CFLAGS_JDKLIB) AC_SUBST(CFLAGS_JDKLIB)
AC_SUBST(CFLAGS_JDKEXE) AC_SUBST(CFLAGS_JDKEXE)
@ -1092,28 +1092,45 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC],
AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG) AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
]) ])
# Setup the JTREG paths # Setup the JTREG paths
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG], AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
[ [
AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg],
[Regression Test Harness @<:@probed@:>@])]) [Regression Test Harness @<:@probed@:>@])],
[],
AC_MSG_CHECKING([for JTReg Regression Test Harness]) [with_jtreg=no])
if test "x$with_jtreg" != x; then if test "x$with_jtreg" = xno; then
JT_HOME="$with_jtreg" # jtreg disabled
BASIC_FIXUP_PATH([JT_HOME]) AC_MSG_CHECKING([for jtreg])
AC_MSG_RESULT($JT_HOME)
# jtreg win32 script works for everybody
JTREGEXE="$JT_HOME/win32/bin/jtreg"
if test ! -f "$JTREGEXE"; then
AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
fi
else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi else
if test "x$with_jtreg" != xyes; then
AC_SUBST(JT_HOME) # with path specified.
AC_SUBST(JTREGEXE) JT_HOME="$with_jtreg"
fi
if test "x$JT_HOME" != x; then
AC_MSG_CHECKING([for jtreg])
# use JT_HOME enviroment var.
BASIC_FIXUP_PATH([JT_HOME])
# jtreg win32 script works for everybody
JTREGEXE="$JT_HOME/win32/bin/jtreg"
if test ! -f "$JTREGEXE"; then
AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE])
fi
AC_MSG_RESULT($JTREGEXE)
else
# try to find jtreg on path
BASIC_REQUIRE_PROG(JTREGEXE, jtreg)
JT_HOME="`$DIRNAME $JTREGEXE`"
fi
fi
AC_SUBST(JT_HOME)
AC_SUBST(JTREGEXE)
]) ])

2
common/makefiles/Main.gmk
View File

@ -183,7 +183,7 @@ bootcycle-images-only: start-make
test: images test-only test: images test-only
test-only: start-make test-only: start-make
@$(call TargetEnter) @$(call TargetEnter)
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k JT_HOME=$(JT_HOME) MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
@$(call TargetExit) @$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

4
common/makefiles/MakeBase.gmk
View File

@ -361,8 +361,8 @@ $(eval $(call SetupLogging))
# This is to be called by all SetupFoo macros # This is to be called by all SetupFoo macros
define LogSetupMacroEntry define LogSetupMacroEntry
$(if $(26),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk)) $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
$(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25,$(if $($i),$(NEWLINE) $(strip [$i] $($i)))))) $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
endef endef
# Make directory without forking mkdir if not needed # Make directory without forking mkdir if not needed

14
common/makefiles/NativeCompilation.gmk
View File

@ -147,9 +147,9 @@ define SetupNativeCompilation
# CC the compiler to use, default is $(CC) # CC the compiler to use, default is $(CC)
# LDEXE the linker to use for linking executables, default is $(LDEXE) # LDEXE the linker to use for linking executables, default is $(LDEXE)
# OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST # OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
$(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
$(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25)) $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
$(if $(26),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk)) $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
ifneq (,$$($1_BIN)) ifneq (,$$($1_BIN))
$$(error BIN has been replaced with OBJECT_DIR) $$(error BIN has been replaced with OBJECT_DIR)
@ -567,6 +567,12 @@ define SetupNativeCompilation
ifneq (,$$($1_GEN_MANIFEST)) ifneq (,$$($1_GEN_MANIFEST))
$(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1 $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
endif endif
# This only works if the openjdk_codesign identity is present on the system. Let
# silently fail otherwise.
ifneq (,$(CODESIGN))
ifneq (,$$($1_CODESIGN))
$(CODESIGN) -s openjdk_codesign $$@
endif
endif
endif endif
endef endef