--- a/common/autoconf/basics.m4 Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/basics.m4 Tue Jul 01 14:26:31 2014 -0700
@@ -512,7 +512,7 @@
)
AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
- [use this directory as sysroot)])],
+ [use this directory as sysroot])],
[SYSROOT=$with_sysroot]
)
@@ -531,6 +531,75 @@
[BASIC_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
)
+ if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
+ # detect if Xcode is installed by running xcodebuild -version
+ # if no Xcode installed, xcodebuild exits with 1
+ # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
+ if /usr/bin/xcodebuild -version >/dev/null 2>&1; then
+ # We need to use xcodebuild in the toolchain dir provided by the user, this will
+ # fall back on the stub binary in /usr/bin/xcodebuild
+ AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
+ else
+ # this should result in SYSROOT being empty, unless --with-sysroot is provided
+ # when only the command line tools are installed there are no SDKs, so headers
+ # are copied into the system frameworks
+ XCODEBUILD=
+ AC_SUBST(XCODEBUILD)
+ fi
+
+ AC_MSG_CHECKING([for sdk name])
+ AC_ARG_WITH([sdk-name], [AS_HELP_STRING([--with-sdk-name],
+ [use the platform SDK of the given name. @<:@macosx@:>@])],
+ [SDKNAME=$with_sdk_name]
+ )
+ AC_MSG_RESULT([$SDKNAME])
+
+ # if toolchain path is specified then don't rely on system headers, they may not compile
+ HAVE_SYSTEM_FRAMEWORK_HEADERS=0
+ test -z "$TOOLCHAIN_PATH" && \
+ HAVE_SYSTEM_FRAMEWORK_HEADERS=`test ! -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; echo $?`
+
+ if test -z "$SYSROOT"; then
+ if test -n "$XCODEBUILD"; then
+ # if we don't have system headers, use default SDK name (last resort)
+ if test -z "$SDKNAME" -a $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+ SDKNAME=${SDKNAME:-macosx}
+ fi
+
+ if test -n "$SDKNAME"; then
+ # Call xcodebuild to determine SYSROOT
+ SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | grep '^Path: ' | sed 's/Path: //'`
+ fi
+ else
+ if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+ AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK])
+ fi
+ fi
+ else
+ # warn user if --with-sdk-name was also set
+ if test -n "$with_sdk_name"; then
+ AC_MSG_WARN([Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used])
+ fi
+ fi
+
+ if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0 -a -z "$SYSROOT"; then
+ # If no system framework headers, then SYSROOT must be set, or we won't build
+ AC_MSG_ERROR([Unable to determine SYSROOT and no headers found in /System/Library/Frameworks. Check Xcode configuration, --with-sysroot or --with-sdk-name arguments.])
+ fi
+
+ # Perform a basic sanity test
+ if test ! -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
+ if test -z "$SYSROOT"; then
+ AC_MSG_ERROR([Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly])
+ else
+ AC_MSG_ERROR([Invalid SDK or SYSROOT path, dependent framework headers not found])
+ fi
+ fi
+
+ # set SDKROOT too, Xcode tools will pick it up
+ AC_SUBST(SDKROOT,$SYSROOT)
+ fi
+
# Prepend the extra path to the global path
BASIC_PREPEND_TO_PATH([PATH],$EXTRA_PATH)
--- a/common/autoconf/flags.m4 Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/flags.m4 Tue Jul 01 14:26:31 2014 -0700
@@ -131,6 +131,10 @@
-L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
-L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
fi
+ elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ # Apple only wants -isysroot <path>, but we also need -iframework<path>/System/Library/Frameworks
+ SYSROOT_CFLAGS="-isysroot \"$SYSROOT\" -iframework\"$SYSROOT/System/Library/Frameworks\""
+ SYSROOT_LDFLAGS=$SYSROOT_CFLAGS
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
SYSROOT_CFLAGS="--sysroot=\"$SYSROOT\""
SYSROOT_LDFLAGS="--sysroot=\"$SYSROOT\""
@@ -143,6 +147,14 @@
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
fi
+
+ # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
+ # set this here so it doesn't have to be peppered throughout the forest
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ SYSROOT_CFLAGS="$SYSROOT_CFLAGS -F\"$SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+ SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -F\"$SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+ fi
+
AC_SUBST(SYSROOT_CFLAGS)
AC_SUBST(SYSROOT_LDFLAGS)
])
@@ -644,23 +656,18 @@
# Additional macosx handling
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- if test "x$TOOLCHAIN_TYPE" = xgcc; then
- # FIXME: This needs to be exported in spec.gmk due to closed legacy code.
- # FIXME: clean this up, and/or move it elsewhere.
+ # 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 if built on a newer version of the OS.
+ # The expected format is X.Y.Z
+ MACOSX_VERSION_MIN=10.7.0
+ AC_SUBST(MACOSX_VERSION_MIN)
- # 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 if built on a newer version of the OS.
- # The expected format is X.Y.Z
- MACOSX_VERSION_MIN=10.7.0
- AC_SUBST(MACOSX_VERSION_MIN)
-
- # The macro takes the version with no dots, ex: 1070
- # Let the flags variables get resolved in make for easier override on make
- # command line.
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
- LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
- fi
+ # The macro takes the version with no dots, ex: 1070
+ # Let the flags variables get resolved in make for easier override on make
+ # command line.
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
fi
# Setup some hard coded includes
--- a/common/autoconf/generated-configure.sh Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/generated-configure.sh Tue Jul 01 14:26:31 2014 -0700
@@ -874,6 +874,8 @@
OUTPUT_ROOT
CONF_NAME
SPEC
+SDKROOT
+XCODEBUILD
BUILD_VARIANT_RELEASE
DEBUG_CLASSFILES
FASTDEBUG
@@ -1040,6 +1042,7 @@
with_tools_dir
with_toolchain_path
with_extra_path
+with_sdk_name
with_conf_name
with_builddeps_conf
with_builddeps_server
@@ -1074,7 +1077,6 @@
with_extra_ldflags
enable_debug_symbols
enable_zip_debug_info
-enable_macosx_runtime_support
with_x
with_cups
with_cups_include
@@ -1085,6 +1087,7 @@
with_alsa
with_alsa_include
with_alsa_lib
+with_libjpeg
with_giflib
with_lcms
with_libpng
@@ -1841,9 +1844,6 @@
--disable-debug-symbols disable generation of debug symbols [enabled]
--disable-zip-debug-info
disable zipping of debug-info files [enabled]
- --enable-macosx-runtime-support
- Deprecated. Option is kept for backwards
- compatibility and is ignored
--disable-freetype-bundling
disable bundling of the freetype library with the
build result [enabled on Windows or when using
@@ -1872,12 +1872,13 @@
optimized (HotSpot build only)) [release]
--with-devkit use this devkit for compilers, tools and resources
--with-sys-root alias for --with-sysroot for backwards compatability
- --with-sysroot use this directory as sysroot)
+ --with-sysroot use this directory as sysroot
--with-tools-dir alias for --with-toolchain-path for backwards
compatibility
--with-toolchain-path prepend these directories when searching for
toolchain binaries (compilers etc)
--with-extra-path prepend these directories to the default path
+ --with-sdk-name use the platform SDK of the given name. [macosx]
--with-conf-name use this as the name of the configuration [generated
from important configuration options]
--with-builddeps-conf use this configuration file for the builddeps
@@ -1942,6 +1943,8 @@
headers under PATH/include)
--with-alsa-include specify directory for the alsa include files
--with-alsa-lib specify directory for the alsa library
+ --with-libjpeg use libjpeg from build system or OpenJDK source
+ (system, bundled) [bundled]
--with-giflib use giflib from build system or OpenJDK source
(system, bundled) [bundled]
--with-lcms use lcms2 from build system or OpenJDK source
@@ -4308,7 +4311,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1402614845
+DATE_WHEN_GENERATED=1403557683
###############################################################################
#
@@ -13607,7 +13610,7 @@
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
- sparcv9)
+ sparcv9|sparc64)
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
@@ -13738,7 +13741,7 @@
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
- sparcv9)
+ sparcv9|sparc64)
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
@@ -14968,6 +14971,122 @@
fi
+ if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
+ # detect if Xcode is installed by running xcodebuild -version
+ # if no Xcode installed, xcodebuild exits with 1
+ # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
+ if /usr/bin/xcodebuild -version >/dev/null 2>&1; then
+ # We need to use xcodebuild in the toolchain dir provided by the user, this will
+ # fall back on the stub binary in /usr/bin/xcodebuild
+ # Extract the first word of "xcodebuild", so it can be a program name with args.
+set dummy xcodebuild; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XCODEBUILD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $XCODEBUILD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XCODEBUILD="$XCODEBUILD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $TOOLCHAIN_PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_XCODEBUILD="$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
+
+ test -z "$ac_cv_path_XCODEBUILD" && ac_cv_path_XCODEBUILD="/usr/bin/xcodebuild"
+ ;;
+esac
+fi
+XCODEBUILD=$ac_cv_path_XCODEBUILD
+if test -n "$XCODEBUILD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODEBUILD" >&5
+$as_echo "$XCODEBUILD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ else
+ # this should result in SYSROOT being empty, unless --with-sysroot is provided
+ # when only the command line tools are installed there are no SDKs, so headers
+ # are copied into the system frameworks
+ XCODEBUILD=
+
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdk name" >&5
+$as_echo_n "checking for sdk name... " >&6; }
+
+# Check whether --with-sdk-name was given.
+if test "${with_sdk_name+set}" = set; then :
+ withval=$with_sdk_name; SDKNAME=$with_sdk_name
+
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDKNAME" >&5
+$as_echo "$SDKNAME" >&6; }
+
+ # if toolchain path is specified then don't rely on system headers, they may not compile
+ HAVE_SYSTEM_FRAMEWORK_HEADERS=0
+ test -z "$TOOLCHAIN_PATH" && \
+ HAVE_SYSTEM_FRAMEWORK_HEADERS=`test ! -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; echo $?`
+
+ if test -z "$SYSROOT"; then
+ if test -n "$XCODEBUILD"; then
+ # if we don't have system headers, use default SDK name (last resort)
+ if test -z "$SDKNAME" -a $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+ SDKNAME=${SDKNAME:-macosx}
+ fi
+
+ if test -n "$SDKNAME"; then
+ # Call xcodebuild to determine SYSROOT
+ SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | grep '^Path: ' | sed 's/Path: //'`
+ fi
+ else
+ if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+ as_fn_error $? "No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK" "$LINENO" 5
+ fi
+ fi
+ else
+ # warn user if --with-sdk-name was also set
+ if test -n "$with_sdk_name"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used" >&5
+$as_echo "$as_me: WARNING: Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used" >&2;}
+ fi
+ fi
+
+ if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0 -a -z "$SYSROOT"; then
+ # If no system framework headers, then SYSROOT must be set, or we won't build
+ as_fn_error $? "Unable to determine SYSROOT and no headers found in /System/Library/Frameworks. Check Xcode configuration, --with-sysroot or --with-sdk-name arguments." "$LINENO" 5
+ fi
+
+ # Perform a basic sanity test
+ if test ! -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
+ if test -z "$SYSROOT"; then
+ as_fn_error $? "Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly" "$LINENO" 5
+ else
+ as_fn_error $? "Invalid SDK or SYSROOT path, dependent framework headers not found" "$LINENO" 5
+ fi
+ fi
+
+ # set SDKROOT too, Xcode tools will pick it up
+ SDKROOT=$SYSROOT
+
+ fi
+
# Prepend the extra path to the global path
if test "x$EXTRA_PATH" != x; then
@@ -26596,21 +26715,28 @@
VALID_TOOLCHAINS=${!toolchain_var_name}
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # On Mac OS X, default toolchain to clang after Xcode 5
- XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
- $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
- if test $? -ne 0; then
- as_fn_error $? "Failed to determine Xcode version." "$LINENO" 5
- fi
- XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
- $SED -e 's/^Xcode \([1-9][0-9.]*\)/\1/' | \
- $CUT -f 1 -d .`
- { $as_echo "$as_me:${as_lineno-$LINENO}: Xcode major version: $XCODE_MAJOR_VERSION" >&5
+ if test -n "$XCODEBUILD"; then
+ # On Mac OS X, default toolchain to clang after Xcode 5
+ XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
+ $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
+ if test $? -ne 0; then
+ as_fn_error $? "Failed to determine Xcode version." "$LINENO" 5
+ fi
+ XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
+ $SED -e 's/^Xcode \([1-9][0-9.]*\)/\1/' | \
+ $CUT -f 1 -d .`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Xcode major version: $XCODE_MAJOR_VERSION" >&5
$as_echo "$as_me: Xcode major version: $XCODE_MAJOR_VERSION" >&6;}
- if test $XCODE_MAJOR_VERSION -ge 5; then
- DEFAULT_TOOLCHAIN="clang"
- else
- DEFAULT_TOOLCHAIN="gcc"
+ if test $XCODE_MAJOR_VERSION -ge 5; then
+ DEFAULT_TOOLCHAIN="clang"
+ else
+ DEFAULT_TOOLCHAIN="gcc"
+ fi
+ else
+ # If Xcode is not installed, but the command line tools are
+ # then we can't run xcodebuild. On these systems we should
+ # default to clang
+ DEFAULT_TOOLCHAIN="clang"
fi
else
# First toolchain type in the list is the default
@@ -41076,6 +41202,10 @@
-L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
-L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
fi
+ elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ # Apple only wants -isysroot <path>, but we also need -iframework<path>/System/Library/Frameworks
+ SYSROOT_CFLAGS="-isysroot \"$SYSROOT\" -iframework\"$SYSROOT/System/Library/Frameworks\""
+ SYSROOT_LDFLAGS=$SYSROOT_CFLAGS
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
SYSROOT_CFLAGS="--sysroot=\"$SYSROOT\""
SYSROOT_LDFLAGS="--sysroot=\"$SYSROOT\""
@@ -41089,6 +41219,14 @@
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
fi
+ # These always need to be set, or we can't find the frameworks embedded in JavaVM.framework
+ # set this here so it doesn't have to be peppered throughout the forest
+ if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+ SYSROOT_CFLAGS="$SYSROOT_CFLAGS -F\"$SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+ SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -F\"$SYSROOT/System/Library/Frameworks/JavaVM.framework/Frameworks\""
+ fi
+
+
@@ -42135,23 +42273,18 @@
# Additional macosx handling
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- if test "x$TOOLCHAIN_TYPE" = xgcc; then
- # FIXME: This needs to be exported in spec.gmk due to closed legacy code.
- # FIXME: clean this up, and/or move it elsewhere.
-
- # 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 if built on a newer version of the OS.
- # The expected format is X.Y.Z
- MACOSX_VERSION_MIN=10.7.0
-
-
- # The macro takes the version with no dots, ex: 1070
- # Let the flags variables get resolved in make for easier override on make
- # command line.
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
- LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
- fi
+ # 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 if built on a newer version of the OS.
+ # The expected format is X.Y.Z
+ MACOSX_VERSION_MIN=10.7.0
+
+
+ # The macro takes the version with no dots, ex: 1070
+ # Let the flags variables get resolved in make for easier override on make
+ # command line.
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
+ LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
fi
# Setup some hard coded includes
@@ -42654,8 +42787,6 @@
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
X11_NOT_NEEDED=yes
- # If the java runtime framework is disabled, then we need X11.
- # This will be adjusted below.
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: alsa pulse x11" >&5
$as_echo "alsa pulse x11" >&6; }
fi
@@ -42676,33 +42807,6 @@
X11_NOT_NEEDED=yes
fi
- ###############################################################################
- #
- # Check for MacOSX support for OpenJDK.
- #
-
-
- # Check whether --enable-macosx-runtime-support was given.
-if test "${enable_macosx_runtime_support+set}" = set; then :
- enableval=$enable_macosx_runtime_support;
-fi
-
- if test "x$enable_macosx_runtime_support" != x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&5
-$as_echo "$as_me: WARNING: Option --enable-macosx-runtime-support is deprecated and will be ignored." >&2;}
- fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Java Framework" >&5
-$as_echo_n "checking for Mac OS X Java Framework... " >&6; }
- if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: /System/Library/Frameworks/JavaVM.framework" >&5
-$as_echo "/System/Library/Frameworks/JavaVM.framework" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- fi
-
###############################################################################
@@ -47573,10 +47677,43 @@
# Check for the jpeg library
#
- USE_EXTERNAL_LIBJPEG=true
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
-$as_echo_n "checking for main in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_main+:} false; then :
+
+# Check whether --with-libjpeg was given.
+if test "${with_libjpeg+set}" = set; then :
+ withval=$with_libjpeg;
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which libjpeg to use" >&5
+$as_echo_n "checking for which libjpeg to use... " >&6; }
+
+ # default is bundled
+ DEFAULT_LIBJPEG=bundled
+
+ #
+ # if user didn't specify, use DEFAULT_LIBJPEG
+ #
+ if test "x${with_libjpeg}" = "x"; then
+ with_libjpeg=${DEFAULT_LIBJPEG}
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libjpeg}" >&5
+$as_echo "${with_libjpeg}" >&6; }
+
+ if test "x${with_libjpeg}" = "xbundled"; then
+ USE_EXTERNAL_LIBJPEG=false
+ elif test "x${with_libjpeg}" = "xsystem"; then
+ ac_fn_cxx_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
+
+else
+ as_fn_error $? "--with-libjpeg=system specified, but jpeglib.h not found!" "$LINENO" 5
+fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_CreateDecompress in -ljpeg" >&5
+$as_echo_n "checking for jpeg_CreateDecompress in -ljpeg... " >&6; }
+if ${ac_cv_lib_jpeg_jpeg_CreateDecompress+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -47584,27 +47721,33 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
-int
-main ()
-{
-return main ();
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_CreateDecompress ();
+int
+main ()
+{
+return jpeg_CreateDecompress ();
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_jpeg_main=yes
-else
- ac_cv_lib_jpeg_main=no
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=yes
+else
+ ac_cv_lib_jpeg_jpeg_CreateDecompress=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
-$as_echo "$ac_cv_lib_jpeg_main" >&6; }
-if test "x$ac_cv_lib_jpeg_main" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_CreateDecompress" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_CreateDecompress" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_CreateDecompress" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBJPEG 1
_ACEOF
@@ -47612,11 +47755,14 @@
LIBS="-ljpeg $LIBS"
else
- USE_EXTERNAL_LIBJPEG=false
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will use jpeg decoder bundled with the OpenJDK source" >&5
-$as_echo "$as_me: Will use jpeg decoder bundled with the OpenJDK source" >&6;}
-
-fi
+ as_fn_error $? "--with-libjpeg=system specified, but no libjpeg found" "$LINENO" 5
+fi
+
+
+ USE_EXTERNAL_LIBJPEG=true
+ else
+ as_fn_error $? "Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'" "$LINENO" 5
+ fi
--- a/common/autoconf/libraries.m4 Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/libraries.m4 Tue Jul 01 14:26:31 2014 -0700
@@ -65,8 +65,6 @@
ALSA_NOT_NEEDED=yes
PULSE_NOT_NEEDED=yes
X11_NOT_NEEDED=yes
- # If the java runtime framework is disabled, then we need X11.
- # This will be adjusted below.
AC_MSG_RESULT([alsa pulse x11])
fi
@@ -83,20 +81,6 @@
if test "x$SUPPORT_HEADFUL" = xno; then
X11_NOT_NEEDED=yes
fi
-
- ###############################################################################
- #
- # Check for MacOSX support for OpenJDK.
- #
-
- BASIC_DEPRECATED_ARG_ENABLE(macosx-runtime-support, macosx_runtime_support)
-
- AC_MSG_CHECKING([for Mac OS X Java Framework])
- if test -f /System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Headers/JavaRuntimeSupport.h; then
- AC_MSG_RESULT([/System/Library/Frameworks/JavaVM.framework])
- else
- AC_MSG_RESULT([no])
- fi
])
AC_DEFUN_ONCE([LIB_SETUP_X11],
@@ -620,11 +604,36 @@
# Check for the jpeg library
#
- USE_EXTERNAL_LIBJPEG=true
- AC_CHECK_LIB(jpeg, main, [],
- [ USE_EXTERNAL_LIBJPEG=false
- AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source])
- ])
+ AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg],
+ [use libjpeg from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+
+ AC_MSG_CHECKING([for which libjpeg to use])
+
+ # default is bundled
+ DEFAULT_LIBJPEG=bundled
+
+ #
+ # if user didn't specify, use DEFAULT_LIBJPEG
+ #
+ if test "x${with_libjpeg}" = "x"; then
+ with_libjpeg=${DEFAULT_LIBJPEG}
+ fi
+
+ AC_MSG_RESULT(${with_libjpeg})
+
+ if test "x${with_libjpeg}" = "xbundled"; then
+ USE_EXTERNAL_LIBJPEG=false
+ elif test "x${with_libjpeg}" = "xsystem"; then
+ AC_CHECK_HEADER(jpeglib.h, [],
+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])])
+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [],
+ [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])])
+
+ USE_EXTERNAL_LIBJPEG=true
+ else
+ AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled'])
+ fi
+
AC_SUBST(USE_EXTERNAL_LIBJPEG)
###############################################################################
--- a/common/autoconf/platform.m4 Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/platform.m4 Tue Jul 01 14:26:31 2014 -0700
@@ -84,7 +84,7 @@
VAR_CPU_BITS=32
VAR_CPU_ENDIAN=big
;;
- sparcv9)
+ sparcv9|sparc64)
VAR_CPU=sparcv9
VAR_CPU_ARCH=sparc
VAR_CPU_BITS=64
--- a/common/autoconf/spec.gmk.in Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/spec.gmk.in Tue Jul 01 14:26:31 2014 -0700
@@ -347,6 +347,9 @@
# The linker can be gcc or ld on posix systems, or link.exe on windows systems.
LD:=@FIXPATH@ @LD@
+# Xcode SDK path
+SDKROOT:=@SDKROOT@
+
# The linker on older SuSE distros (e.g. on SLES 10) complains with:
# "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
# if feeded with a version script which contains named tags.
@@ -544,7 +547,7 @@
XATTR:=@XATTR@
JT_HOME:=@JT_HOME@
JTREGEXE:=@JTREGEXE@
-
+XCODEBUILD=@XCODEBUILD@
FIXPATH:=@FIXPATH@
# Where the build output is stored for your convenience.
--- a/common/autoconf/toolchain.m4 Wed Jul 05 19:47:10 2017 +0200
+++ b/common/autoconf/toolchain.m4 Tue Jul 01 14:26:31 2014 -0700
@@ -98,20 +98,27 @@
VALID_TOOLCHAINS=${!toolchain_var_name}
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # On Mac OS X, default toolchain to clang after Xcode 5
- XCODE_VERSION_OUTPUT=`xcodebuild -version 2>&1 | $HEAD -n 1`
- $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
- if test $? -ne 0; then
- AC_MSG_ERROR([Failed to determine Xcode version.])
- fi
- XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
- $SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \
- $CUT -f 1 -d .`
- AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION])
- if test $XCODE_MAJOR_VERSION -ge 5; then
- DEFAULT_TOOLCHAIN="clang"
+ if test -n "$XCODEBUILD"; then
+ # On Mac OS X, default toolchain to clang after Xcode 5
+ XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
+ $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
+ if test $? -ne 0; then
+ AC_MSG_ERROR([Failed to determine Xcode version.])
+ fi
+ XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
+ $SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \
+ $CUT -f 1 -d .`
+ AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION])
+ if test $XCODE_MAJOR_VERSION -ge 5; then
+ DEFAULT_TOOLCHAIN="clang"
+ else
+ DEFAULT_TOOLCHAIN="gcc"
+ fi
else
- DEFAULT_TOOLCHAIN="gcc"
+ # If Xcode is not installed, but the command line tools are
+ # then we can't run xcodebuild. On these systems we should
+ # default to clang
+ DEFAULT_TOOLCHAIN="clang"
fi
else
# First toolchain type in the list is the default
--- a/get_source.sh Wed Jul 05 19:47:10 2017 +0200
+++ b/get_source.sh Tue Jul 01 14:26:31 2014 -0700
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -25,9 +25,48 @@
# questions.
#
-# Get clones of all nested repositories
-sh ./common/bin/hgforest.sh clone "$@" || exit 1
+# Version check
+
+# required
+reqdmajor=1
+reqdminor=5
+reqdrev=0
+
+# requested
+rqstmajor=2
+rqstminor=6
+rqstrev=3
+
+# installed
+hgwhere="`which hg 2> /dev/null | grep -v '^no hg in '`"
+if [ "x$hgwhere" = "x" ]; then
+ echo "ERROR: Could not locate Mercurial command" >&2
+ exit 126
+fi
+
+hgversion="`hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \(.*\))\$@\1@p'`"
+if [ "x${hgversion}" = "x" ] ; then
+ echo "ERROR: Could not determine Mercurial version" >&2
+ exit 126
+fi
+
+hgmajor="`echo $hgversion | cut -f 1 -d .`"
+hgminor="`echo $hgversion | cut -f 2 -d .`"
+hgrev="`echo $hgversion.0 | cut -f 3 -d .`" # rev is omitted for minor and major releases
+
+# Require
+if [ $hgmajor -lt $reqdmajor -o \( $hgmajor -eq $reqdmajor -a $hgminor -lt $reqdminor \) -o \( $hgmajor -eq $reqdmajor -a $hgminor -eq $reqdminor -a $hgrev -lt $reqdrev \) ] ; then
+ echo "ERROR: Mercurial version $reqdmajor.$reqdminor.$reqdrev or later is required. $hgwhere is version $hgversion" >&2
+ exit 126
+fi
+
+# Request
+if [ $hgmajor -lt $rqstmajor -o \( $hgmajor -eq $rqstmajor -a $hgminor -lt $rqstminor \) -o \( $hgmajor -eq $rqstmajor -a $hgminor -eq $rqstminor -a $hgrev -lt $rqstrev \) ] ; then
+ echo "WARNING: Mercurial version $rqstmajor.$rqstminor.$rqstrev or later is recommended. $hgwhere is version $hgversion" >&2
+fi
+
+# Get clones of all absent nested repositories (harmless if already exist)
+sh ./common/bin/hgforest.sh clone "$@" || exit $?
# Update all existing repositories to the latest sources
sh ./common/bin/hgforest.sh pull -u
-
--- a/make/Javadoc.gmk Wed Jul 05 19:47:10 2017 +0200
+++ b/make/Javadoc.gmk Tue Jul 01 14:26:31 2014 -0700
@@ -118,7 +118,7 @@
COPYRIGHT_URL = $(DOCSDIR_URL)/legal/cpyr.html
# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
+BUG_SUBMIT_URL = http://bugreport.java.com/bugreport/
# Common line for how to submit a bug or rfe
BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
@@ -442,7 +442,7 @@
$(DOCLETAPI_OPTIONS_FILE):
$(prep-target)
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionOnly,-Xdoclint:none) ; \
+ $(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-breakiterator) ; \
@@ -499,7 +499,7 @@
$(TAGLETAPI_OPTIONS_FILE):
$(prep-target)
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionOnly,-Xdoclint:none) ; \
+ $(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionOnly,-nonavbar) ; \
@@ -527,7 +527,7 @@
DOMAPI_HEADER := <strong>Common DOM API</strong>
DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
+DOMAPI_REGEXP := org.w3c.dom*
# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
# The index.html, options, and packages files
@@ -1074,7 +1074,7 @@
$(TREEAPI_OPTIONS_FILE):
$(prep-target)
@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionOnly,-Xdoclint:none) ; \
+ $(call OptionOnly,-Xdoclint:all) ; \
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
$(call OptionPair,-encoding,ascii) ; \
$(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
--- a/make/common/CORE_PKGS.gmk Wed Jul 05 19:47:10 2017 +0200
+++ b/make/common/CORE_PKGS.gmk Tue Jul 01 14:26:31 2014 -0700
@@ -39,8 +39,6 @@
org.w3c.dom.css \
org.w3c.dom.html \
org.w3c.dom.stylesheets \
- org.w3c.dom.traversal \
- org.w3c.dom.ranges \
org.omg.stub.javax.management.remote.rmi
#
@@ -294,6 +292,8 @@
org.w3c.dom.events \
org.w3c.dom.bootstrap \
org.w3c.dom.ls \
+ org.w3c.dom.ranges \
+ org.w3c.dom.traversal \
org.w3c.dom.views \
org.xml.sax \
org.xml.sax.ext \
--- a/make/common/NON_CORE_PKGS.gmk Wed Jul 05 19:47:10 2017 +0200
+++ b/make/common/NON_CORE_PKGS.gmk Tue Jul 01 14:26:31 2014 -0700
@@ -33,8 +33,7 @@
# team when determining which APIs to extract javadoc
# comments from.
-DOMAPI_PKGS = com.sun.java.browser.dom \
- org.w3c.dom \
+DOMAPI_PKGS = org.w3c.dom \
org.w3c.dom.bootstrap \
org.w3c.dom.ls \
org.w3c.dom.ranges \
--- a/make/jprt.properties Wed Jul 05 19:47:10 2017 +0200
+++ b/make/jprt.properties Tue Jul 01 14:26:31 2014 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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,151 +23,458 @@
# questions.
#
-# Properties for jprt
+##############
+#
+# Global settings
+#
-# Locked down to jdk9
+# The current release name
jprt.tools.default.release=jdk9
-# Unix toolkit to use for building on windows
-jprt.windows.jdk8.build.unix.toolkit=cygwin
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets= \
- solaris_sparcv9_5.11-{product|fastdebug}, \
- solaris_x64_5.11-{product|fastdebug}, \
- linux_i586_2.6-{product|fastdebug}, \
- linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{product|fastdebug}
-
-# User can select the test set with jprt submit "-testset name" option
-jprt.my.test.set=${jprt.test.set}
-
-# Test target list (no fastdebug & limited c2 testing)
-jprt.my.test.target.set= \
- solaris_sparcv9_5.11-product-c2-TESTNAME, \
- solaris_x64_5.11-product-c2-TESTNAME, \
- linux_i586_2.6-product-{c1|c2}-TESTNAME, \
- linux_x64_2.6-product-c2-TESTNAME, \
- macosx_x64_10.7-product-c2-TESTNAME, \
- windows_i586_6.1-product-c1-TESTNAME, \
- windows_x64_6.1-product-c2-TESTNAME
-
-# Default vm test targets (testset=default)
-jprt.vm.default.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jvm98}, \
- ${jprt.my.test.target.set:TESTNAME=scimark}
-
-# Default jdk test targets (testset=default)
-jprt.make.rule.default.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_util}
-
-
-# Default vm test targets (testset=core)
-jprt.vm.core.test.targets=
+# Check if this is the equivalent of a hotspot push job
+# Interpret -testset hotspot to mean exactly that
+my.is.hotspot.job.hotspot=true
+my.is.hotspot.job=${my.is.hotspot.job.${jprt.test.set}}
-# Core jdk test targets (testset=core)
-jprt.make.rule.core.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_util}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_io}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_net}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_nio}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_time}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_other}, \
- ${jprt.my.test.target.set:TESTNAME=core_tools}
-
-# Svc vm test targets (testset=svc)
-jprt.vm.svc.test.targets=
-
-# Core jdk test targets (testset=svc)
-jprt.make.rule.svc.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jdk_management}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_instrument}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jmx}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jdi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \
- ${jprt.my.test.target.set:TESTNAME=svc_tools}
-
-# All vm test targets (testset=all)
-jprt.vm.all.test.targets= \
- ${jprt.vm.default.test.targets}, \
- ${jprt.my.test.target.set:TESTNAME=runThese}, \
- ${jprt.my.test.target.set:TESTNAME=jbb_default}
-
-# All jdk test targets (testset=all)
-jprt.make.rule.all.test.targets= \
- ${jprt.make.rule.core.test.targets}, \
- ${jprt.make.rule.svc.test.targets}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_swing}
-
-# PIT vm test targets (testset=pit)
-jprt.vm.pit.test.targets= \
- ${jprt.vm.all.test.targets}
-
-# PIT jdk test targets (testset=pit)
-jprt.make.rule.pit.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
- ${jprt.make.rule.core.test.targets}, \
- ${jprt.make.rule.svc.test.targets}
-
-# JCK test targets in test/Makefile (no windows)
-jprt.my.jck.test.target.set= \
- solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, \
- solaris_x64_5.11-product-c2-JCK7TESTRULE, \
- linux_i586_2.6-product-c1-JCK7TESTRULE, \
- linux_x64_2.6-product-c2-JCK7TESTRULE
-
-# JCK testset targets (e.g. jprt submit -testset jck ... )
-jprt.make.rule.jck.test.targets= \
- ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools}, \
- ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime}, \
- ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
-
-# Select list to use (allow for testset to be empty too)
-jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
-jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
-jprt.vm..test.targets=${jprt.vm.default.test.targets}
-jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
+# Disable syncing the source after builds and tests are done
+jprt.sync.push=${my.is.hotspot.job ? false : true}
# Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev
-# Instruct jprt to use configure when building
+# Use configure when building
jprt.build.use.configure=true
+
+# Set make target to use for different build flavors
+jprt.build.flavor.debugOpen.target=jprt_bundle
+jprt.build.flavor.fastdebug.target=jprt_bundle
jprt.build.flavor.product.target=jprt_bundle
-jprt.build.flavor.fastdebug.target=jprt_bundle
-jprt.build.flavor.debug.target=jprt_bundle
+jprt.build.flavor.productOpen.target=jprt_bundle
+
+# Use these configure args to define debug level
+jprt.debug.build.configure.args=--with-debug-level=slowdebug
+jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
+jprt.product.build.configure.args=--with-debug-level=release
+jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
+jprt.fastdebugOpen.build.configure.args=${jprt.fastdebug.build.configure.args} --enable-openjdk-only
+jprt.productOpen.build.configure.args=${jprt.product.build.configure.args} --enable-openjdk-only
+
+# Select build flavors and build targets
+jprt.build.flavors=${my.is.hotspot.job ? ${my.build.flavors.hotspot} : ${my.build.flavors.default}}
+jprt.build.targets=${my.is.hotspot.job ? ${my.build.targets.hotspot} : ${my.build.targets.default}}
+
+# Select test targets - jprt default for jprt.test.set is "default"
+jprt.test.targets=${my.test.targets.${jprt.test.set}}
+jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
+
+# 7155453: Work-around to prevent popups on OSX from blocking test completion
+# but the work-around is added to all platforms to be consistent
+jprt.jbb.options=-Djava.awt.headless=true
+
+########
+#
+# Build options (generic)
+#
+
+# Configure args common to all builds
+# Also allows for additional, testset specific configure arguments to be set
+jprt.build.configure.args= \
+ --with-boot-jdk=$ALT_BOOTDIR \
+ --with-jobs=$ALT_PARALLEL_COMPILE_JOBS \
+ ${my.additional.build.configure.args.${jprt.test.set}}
+
+# i586 is often cross-compiled from 64-bit machines, so need to set target bits explicitly
+jprt.i586.build.configure.args= \
+ --with-target-bits=32
+
+# i586 platforms have both client and server, but to allow for overriding the exact configuration
+# on a per-build flavor basis the value is set for the individual build flavors
+my.i586.default.build.configure.args= \
+ --with-jvm-variants=client,server
+jprt.i586.debug.build.configure.args= \
+ ${my.i586.default.build.configure.args} \
+ ${jprt.debug.build.configure.args}
+jprt.i586.fastdebug.build.configure.args= \
+ ${my.i586.default.build.configure.args} \
+ ${jprt.fastdebug.build.configure.args}
+jprt.i586.product.build.configure.args= \
+ ${my.i586.default.build.configure.args} \
+ ${jprt.product.build.configure.args}
+jprt.i586.debugOpen.build.configure.args= \
+ ${my.i586.default.build.configure.args} \
+ ${jprt.debugOpen.build.configure.args}
+jprt.i586.fastdebugOpen.build.configure.args= \
+ ${my.i586.default.build.configure.args} \
+ ${jprt.fastdebugOpen.build.configure.args}
+jprt.i586.productOpen.build.configure.args= \
+ ${my.i586.default.build.configure.args} \
+ ${jprt.productOpen.build.configure.args}
+
+########
+#
+# Build targets and options (default/jdk)
+#
+
+# The default build flavors
+my.build.flavors.default=fastdebug,product
+
+# Standard list of jprt build targets for this source tree
+my.build.targets.default= \
+ solaris_sparcv9_5.11-{product|fastdebug}, \
+ solaris_x64_5.11-{product|fastdebug}, \
+ linux_i586_2.6-{product|fastdebug}, \
+ linux_x64_2.6-{product|fastdebug}, \
+ macosx_x64_10.7-{product|fastdebug}, \
+ windows_i586_6.1-{product|fastdebug}, \
+ windows_x64_6.1-{product|fastdebug}
+
+# Test target list (no fastdebug & limited c2 testing)
+my.test.target.set= \
+ solaris_sparcv9_5.11-product-c2-TESTNAME, \
+ solaris_x64_5.11-product-c2-TESTNAME, \
+ linux_i586_2.6-product-{c1|c2}-TESTNAME, \
+ linux_x64_2.6-product-c2-TESTNAME, \
+ macosx_x64_10.7-product-c2-TESTNAME, \
+ windows_i586_6.1-product-c1-TESTNAME, \
+ windows_x64_6.1-product-c2-TESTNAME
+
+# Default vm test targets (testset=default)
+my.test.targets.default= \
+ ${my.test.target.set:TESTNAME=jvm98}, \
+ ${my.test.target.set:TESTNAME=scimark}
+
+# Default jdk test targets (testset=default)
+my.make.rule.test.targets.default= \
+ ${my.test.target.set:TESTNAME=langtools_jtreg}, \
+ ${my.test.target.set:TESTNAME=jdk_lang}, \
+ ${my.test.target.set:TESTNAME=jdk_math}, \
+ ${my.test.target.set:TESTNAME=jdk_util}
+
+# Default vm test targets (testset=core)
+my.test.targets.core=
+
+# Core jdk test targets (testset=core)
+my.make.rule.test.targets.core= \
+ ${my.test.target.set:TESTNAME=jdk_lang}, \
+ ${my.test.target.set:TESTNAME=jdk_math}, \
+ ${my.test.target.set:TESTNAME=jdk_util}, \
+ ${my.test.target.set:TESTNAME=jdk_io}, \
+ ${my.test.target.set:TESTNAME=jdk_net}, \
+ ${my.test.target.set:TESTNAME=jdk_nio}, \
+ ${my.test.target.set:TESTNAME=jdk_security1}, \
+ ${my.test.target.set:TESTNAME=jdk_security2}, \
+ ${my.test.target.set:TESTNAME=jdk_security3}, \
+ ${my.test.target.set:TESTNAME=jdk_rmi}, \
+ ${my.test.target.set:TESTNAME=jdk_text}, \
+ ${my.test.target.set:TESTNAME=jdk_time}, \
+ ${my.test.target.set:TESTNAME=jdk_other}, \
+ ${my.test.target.set:TESTNAME=core_tools}
+
+# Svc vm test targets (testset=svc)
+my.test.targets.svc=
+
+# Core jdk test targets (testset=svc)
+my.make.rule.test.targets.svc= \
+ ${my.test.target.set:TESTNAME=jdk_management}, \
+ ${my.test.target.set:TESTNAME=jdk_instrument}, \
+ ${my.test.target.set:TESTNAME=jdk_jmx}, \
+ ${my.test.target.set:TESTNAME=jdk_jdi}, \
+ ${my.test.target.set:TESTNAME=jdk_jfr}, \
+ ${my.test.target.set:TESTNAME=svc_tools}
+
+# All vm test targets (testset=all)
+my.test.targets.all= \
+ ${my.test.targets.default}, \
+ ${my.test.target.set:TESTNAME=runThese}, \
+ ${my.test.target.set:TESTNAME=jbb_default}
+
+# All jdk test targets (testset=all)
+my.make.rule.test.targets.all= \
+ ${my.make.rule.test.targets.core}, \
+ ${my.make.rule.test.targets.svc}, \
+ ${my.test.target.set:TESTNAME=jdk_awt}, \
+ ${my.test.target.set:TESTNAME=jdk_beans1}, \
+ ${my.test.target.set:TESTNAME=jdk_beans2}, \
+ ${my.test.target.set:TESTNAME=jdk_beans3}, \
+ ${my.test.target.set:TESTNAME=jdk_sound}, \
+ ${my.test.target.set:TESTNAME=jdk_swing}
+
+# PIT vm test targets (testset=pit)
+my.test.targets.pit= \
+ ${my.test.targets.all}
+
+# PIT jdk test targets (testset=pit)
+my.make.rule.test.targets.pit= \
+ ${my.test.target.set:TESTNAME=langtools_jtreg}, \
+ ${my.make.rule.test.targets.core}, \
+ ${my.make.rule.test.targets.svc}
+
+# JCK test targets in test/Makefile (no windows)
+my.test.target.set.jck= \
+ solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, \
+ solaris_x64_5.11-product-c2-JCK7TESTRULE, \
+ linux_i586_2.6-product-c1-JCK7TESTRULE, \
+ linux_x64_2.6-product-c2-JCK7TESTRULE
+
+# JCK testset targets
+my.make.rule.test.targets.jck= \
+ ${my.test.target.set.jck:JCK7TESTRULE=jck7devtools}, \
+ ${my.test.target.set.jck:JCK7TESTRULE=jck7runtime}, \
+ ${my.test.target.set.jck:JCK7TESTRULE=jck7compiler}
+
+
+#############
+#
+# Hotspot related settings (testset=hotspot)
+#
+
+# The hotspot build flavors
+my.build.flavors.hotspot= \
+ debugOpen,fastdebug,product,productOpen, \
+ ${my.additional.build.flavors.hotspot}
+
+# Platforms built for hotspot push jobs
+my.build.targets.hotspot= \
+ solaris_sparcv9_5.11-{product|fastdebug|optimized}, \
+ solaris_x64_5.11-{product|fastdebug}, \
+ linux_i586_2.6-{product|fastdebug}, \
+ linux_x64_2.6-{product|fastdebug|optimized}, \
+ macosx_x64_10.7-{product|fastdebug}, \
+ windows_i586_6.1-{product|fastdebug}, \
+ windows_x64_6.1-{product|fastdebug|optimized}, \
+ solaris_x64_5.11-{debugOpen}, \
+ linux_x64_2.6-{productOpen}, \
+ ${my.additional.build.targets.hotspot}
-# Add these configure args to all builds
-jprt.build.configure.args= \
- --with-boot-jdk=$ALT_BOOTDIR \
- --with-jobs=$ALT_PARALLEL_COMPILE_JOBS
+# Tests to run on the various platforms for hotspot push jobs
+my.test.targets.hotspot.solaris.sparcv9= \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98_nontiered, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-scimark, \
+ solaris_sparcv9_5.11-product-c2-runThese, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_CMS, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_G1, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_CMS, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1, \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParOldGC
+
+my.test.targets.hotspot.solaris.x64= \
+ solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \
+ solaris_x64_5.11-{product|fastdebug}-c2-jvm98_nontiered, \
+ solaris_x64_5.11-{product|fastdebug}-c2-scimark, \
+ solaris_x64_5.11-product-c2-runThese, \
+ solaris_x64_5.11-product-c2-runThese_Xcomp, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_CMS, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_G1, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \
+ solaris_x64_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_CMS, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_G1, \
+ solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParOldGC
+
+my.test.targets.hotspot.linux.i586= \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98, \
+ linux_i586_2.6-{product|fastdebug}-c2-jvm98_nontiered, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-scimark, \
+ linux_i586_2.6-product-c1-runThese_Xcomp, \
+ linux_i586_2.6-fastdebug-c1-runThese_Xshare, \
+ linux_i586_2.6-fastdebug-c2-runThese_Xcomp, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
+ linux_i586_2.6-product-{c1|c2}-GCOld_SerialGC, \
+ linux_i586_2.6-product-{c1|c2}-GCOld_ParallelGC, \
+ linux_i586_2.6-product-{c1|c2}-GCOld_ParNewGC, \
+ linux_i586_2.6-product-{c1|c2}-GCOld_CMS, \
+ linux_i586_2.6-product-{c1|c2}-GCOld_G1, \
+ linux_i586_2.6-product-{c1|c2}-GCOld_ParOldGC, \
+ linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC, \
+ linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
+ linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC, \
+ linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS, \
+ linux_i586_2.6-{product|fastdebug}-c1-jbb_G1, \
+ linux_i586_2.6-{product|fastdebug}-c1-jbb_ParOldGC
+
+my.test.targets.hotspot.linux.x64= \
+ linux_x64_2.6-{product|fastdebug}-c2-jvm98, \
+ linux_x64_2.6-{product|fastdebug}-c2-jvm98_nontiered, \
+ linux_x64_2.6-{product|fastdebug}-c2-scimark, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCOld_SerialGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCOld_CMS, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCOld_G1, \
+ linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
+ linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC, \
+ linux_x64_2.6-{product|fastdebug}-c2-jbb_G1, \
+ linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
-# Add these configure args to 32 bit builds
-jprt.i586.build.configure.args= \
- --with-target-bits=32 \
- --with-jvm-variants=client,server
+my.test.targets.hotspot.macosx.x64= \
+ macosx_x64_10.7-{product|fastdebug}-c2-jvm98, \
+ macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered, \
+ macosx_x64_10.7-{product|fastdebug}-c2-scimark, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCOld_SerialGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1, \
+ macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered, \
+ macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC, \
+ macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1, \
+ macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC
+
+my.test.targets.hotspot.windows.i586= \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98, \
+ windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark, \
+ windows_i586_6.1-product-{c1|c2}-runThese, \
+ windows_i586_6.1-product-{c1|c2}-runThese_Xcomp, \
+ windows_i586_6.1-fastdebug-c1-runThese_Xshare, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
+ windows_i586_6.1-product-{c1|c2}-GCOld_SerialGC, \
+ windows_i586_6.1-product-{c1|c2}-GCOld_ParallelGC, \
+ windows_i586_6.1-product-{c1|c2}-GCOld_ParNewGC, \
+ windows_i586_6.1-product-{c1|c2}-GCOld_CMS, \
+ windows_i586_6.1-product-{c1|c2}-GCOld_G1, \
+ windows_i586_6.1-product-{c1|c2}-GCOld_ParOldGC, \
+ windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default, \
+ windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \
+ windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC, \
+ windows_i586_6.1-product-{c1|c2}-jbb_CMS, \
+ windows_i586_6.1-product-{c1|c2}-jbb_G1, \
+ windows_i586_6.1-product-{c1|c2}-jbb_ParOldGC
-# Use these configure args to define debug level.
-jprt.product.build.configure.args=--with-debug-level=release
-jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
-jprt.debug.build.configure.args=--with-debug-level=slowdebug
+my.test.targets.hotspot.windows.x64= \
+ windows_x64_6.1-{product|fastdebug}-c2-jvm98, \
+ windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered, \
+ windows_x64_6.1-{product|fastdebug}-c2-scimark, \
+ windows_x64_6.1-product-c2-runThese, \
+ windows_x64_6.1-product-c2-runThese_Xcomp, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCOld_SerialGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCOld_CMS, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCOld_G1, \
+ windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParOldGC, \
+ windows_x64_6.1-{product|fastdebug}-c2-jbb_default, \
+ windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \
+ windows_x64_6.1-product-c2-jbb_CMS, \
+ windows_x64_6.1-product-c2-jbb_ParallelGC, \
+ windows_x64_6.1-product-c2-jbb_G1, \
+ windows_x64_6.1-product-c2-jbb_ParOldGC
+
+# Some basic "smoke" tests for OpenJDK builds
+my.test.targets.hotspot.open= \
+ solaris_x64_5.11-{productOpen|fastdebugOpen}-c2-jvm98, \
+ linux_x64_2.6-{productOpen|fastdebugOpen}-c2-jvm98
+
+# The complete list of test targets for jprt
+my.test.targets.hotspot= \
+ ${my.test.targets.hotspot.open}, \
+ ${my.test.targets.hotspot.solaris.sparcv9}, \
+ ${my.test.targets.hotspot.solaris.x64}, \
+ ${my.test.targets.hotspot.linux.i586}, \
+ ${my.test.targets.hotspot.linux.x64}, \
+ ${my.test.targets.hotspot.macosx.x64}, \
+ ${my.test.targets.hotspot.windows.i586}, \
+ ${my.test.targets.hotspot.windows.x64}, \
+ ${my.test.targets.hotspot.solaris.sparcv9}, \
+ ${my.test.targets.hotspot.solaris.x64}, \
+ ${my.test.targets.hotspot.linux.x64}, \
+ ${my.test.targets.hotspot.windows.i586}, \
+ ${my.test.targets.hotspot.windows.x64}, \
+ ${my.additional.test.targets.hotspot}
+
+
+# Make file based test targets
+
+my.make.rule.test.targets.hotspot.clienttests= \
+ linux_i586_2.6-*-c1-hotspot_clienttest, \
+ windows_i586_6.1-*-c1-hotspot_clienttest
+
+my.make.rule.test.targets.hotspot.servertests= \
+ solaris_sparcv9_5.11-*-c2-hotspot_servertest, \
+ solaris_x64_5.11-*-c2-hotspot_servertest, \
+ linux_i586_2.6-*-c2-hotspot_servertest, \
+ linux_x64_2.6-*-c2-hotspot_servertest, \
+ macosx_x64_10.7-*-c2-hotspot_servertest, \
+ windows_i586_6.1-*-c2-hotspot_servertest, \
+ windows_x64_6.1-*-c2-hotspot_servertest
+
+my.make.rule.test.targets.hotspot.internalvmtests= \
+ solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \
+ solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \
+ linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \
+ linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \
+ macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests, \
+ windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \
+ windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
+
+my.make.rule.test.targets.hotspot.wbapitests= \
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-hotspot_wbapitest, \
+ solaris_x64_5.11-{product|fastdebug}-c2-hotspot_wbapitest, \
+ linux_i586_2.6-{product|fastdebug}-c2-hotspot_wbapitest, \
+ linux_x64_2.6-{product|fastdebug}-c2-hotspot_wbapitest, \
+ windows_i586_6.1-{product|fastdebug}-c2-hotspot_wbapitest, \
+ windows_x64_6.1-{product|fastdebug}-c2-hotspot_wbapitest, \
+ linux_i586_2.6-{product|fastdebug}-c1-hotspot_wbapitest, \
+ windows_i586_6.1-{product|fastdebug}-c1-hotspot_wbapitest
+
+my.make.rule.test.targets.hotspot= \
+ ${my.make.rule.test.targets.hotspot.clienttests}, \
+ ${my.make.rule.test.targets.hotspot.servertests}, \
+ ${my.make.rule.test.targets.hotspot.internalvmtests}, \
+ ${my.make.rule.test.targets.hotspot.wbapitests}, \
+ ${my.additional.make.rule.test.targets.hotspot}