OpenJDK / jdk / hs
changeset 22332:fba4c66089bb
Merge
| author | chegar |
|---|---|
| date | Mon, 21 Oct 2013 15:00:56 +0100 |
| parents | f65a493da643 81e2a41dfed2 |
| children | 8af4eeeb9fa7 e86fef5f34cb |
| files | hotspot/test/testlibrary/AssertsTest.java hotspot/test/testlibrary/OutputAnalyzerReportingTest.java hotspot/test/testlibrary/OutputAnalyzerTest.java jdk/makefiles/CompileJavaClasses.gmk jdk/makefiles/CompileNativeLibraries.gmk jdk/makefiles/CreateJars.gmk jdk/makefiles/GendataBreakIterator.gmk jdk/makefiles/GendataFontConfig.gmk jdk/makefiles/GendataHtml32dtd.gmk jdk/makefiles/GendataTZDB.gmk jdk/makefiles/GendataTimeZone.gmk jdk/makefiles/GenerateJavaSources.gmk jdk/makefiles/GenerateSources.gmk jdk/makefiles/GensrcBuffer.gmk jdk/makefiles/GensrcCLDR.gmk jdk/makefiles/GensrcCharacterData.gmk jdk/makefiles/GensrcCharsetCoder.gmk jdk/makefiles/GensrcCharsetMapping.gmk jdk/makefiles/GensrcExceptions.gmk jdk/makefiles/GensrcIcons.gmk jdk/makefiles/GensrcJDWP.gmk jdk/makefiles/GensrcJObjC.gmk jdk/makefiles/GensrcLocaleDataMetaInfo.gmk jdk/makefiles/GensrcMisc.gmk jdk/makefiles/GensrcProperties.gmk jdk/makefiles/GensrcSwing.gmk jdk/makefiles/GensrcX11Wrappers.gmk jdk/makefiles/Images.gmk jdk/makefiles/Profiles.gmk jdk/src/share/classes/com/sun/jdi/connect/package.html jdk/src/share/classes/com/sun/jdi/connect/spi/package.html jdk/src/share/classes/com/sun/jdi/event/package.html jdk/src/share/classes/com/sun/jdi/package.html jdk/src/share/classes/com/sun/jdi/request/package.html jdk/src/share/classes/com/sun/management/package.html jdk/src/share/classes/com/sun/tools/attach/package.html jdk/src/share/classes/com/sun/tools/attach/spi/package.html jdk/src/share/classes/com/sun/tools/jconsole/package.html jdk/src/share/classes/java/lang/invoke/InvokeGeneric.java jdk/src/share/classes/java/lang/invoke/MagicLambdaImpl.java jdk/src/share/classes/java/net/HttpURLPermission.java jdk/src/share/classes/java/time/chrono/ChronoDateImpl.java jdk/src/share/classes/java/util/logging/LogManager.java jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java jdk/src/share/classes/javax/swing/SwingUtilities.java jdk/src/share/classes/javax/swing/event/EventListenerList.java jdk/src/share/classes/sun/security/ssl/Handshaker.java jdk/src/share/classes/sun/security/tools/jarsigner/Main.java jdk/src/share/lib/security/java.security-macosx jdk/src/share/lib/security/java.security-windows jdk/src/solaris/doc/sun/man/man1/ja/javaws.1 jdk/src/solaris/doc/sun/man/man1/javaws.1 jdk/test/com/oracle/security/ucrypto/TestAES.java jdk/test/com/oracle/security/ucrypto/TestDigest.java jdk/test/com/oracle/security/ucrypto/TestRSA.java jdk/test/com/oracle/security/ucrypto/UcryptoTest.java jdk/test/java/lang/SecurityManager/CheckPackageAccess.java jdk/test/java/net/HttpURLPermission/HttpURLPermissionTest.java jdk/test/java/net/HttpURLPermission/URLTest.java jdk/test/java/net/HttpURLPermission/policy.1 jdk/test/java/net/HttpURLPermission/policy.2 jdk/test/java/net/HttpURLPermission/policy.3 jdk/test/java/time/tck/java/time/chrono/TCKChronologySerialization.java langtools/src/share/classes/jdk/Supported.java langtools/test/tools/javac/generics/OverrideBridge.java nashorn/make/java.security.override |
| diffstat | 2092 files changed, 71335 insertions(+), 44410 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Oct 21 09:56:06 2013 +0200 +++ b/.hgtags Mon Oct 21 15:00:56 2013 +0100 @@ -231,3 +231,5 @@ 892889f445755790ae90e61775bfb59ddc6182b5 jdk8-b107 74049f7a28b48c14910106a75d9f2504169c352e jdk8-b108 af9a674e12a16da1a4bd53e4990ddb1121a21ef1 jdk8-b109 +b5d2bf482a3ea1cca08c994512804ffbc73de0a1 jdk8-b110 +b9a0f6c693f347a6f4b9bb994957f4eaa05bdedd jdk8-b111
--- a/.hgtags-top-repo Mon Oct 21 09:56:06 2013 +0200 +++ b/.hgtags-top-repo Mon Oct 21 15:00:56 2013 +0100 @@ -231,3 +231,5 @@ 0874bb4707b723d5bb108d379c557cf41529d1a7 jdk8-b107 9286a6e61291246d88af713f1ef79adeea30fe2e jdk8-b108 91f47e8da5c60de58ed195e9b57f3bf192a18f83 jdk8-b109 +4faa09c7fe555de086dd9048d3c5cc92317d6f45 jdk8-b110 +d086227bfc45d124f09b3bd72a07956b4073bf71 jdk8-b111
--- a/NewMakefile.gmk Mon Oct 21 09:56:06 2013 +0200 +++ b/NewMakefile.gmk Mon Oct 21 15:00:56 2013 +0100 @@ -37,16 +37,16 @@ # Assume we have GNU make, but check version. ifeq (,$(findstring 3.81,$(MAKE_VERSION))) - ifeq (,$(findstring 3.82,$(MAKE_VERSION))) - $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) - endif + ifeq (,$(findstring 3.82,$(MAKE_VERSION))) + $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) + endif endif # Locate this Makefile ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) + makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) else - makefile_path:=$(lastword $(MAKEFILE_LIST)) + makefile_path:=$(lastword $(MAKEFILE_LIST)) endif root_dir:=$(dir $(makefile_path)) @@ -58,27 +58,27 @@ # Now determine if we have zero, one or several configurations to build. ifeq ($(SPEC),) - # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. + # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. else - ifeq ($(words $(SPEC)),1) - # We are building a single configuration. This is the normal case. Execute the Main.gmk file. - include $(root_dir)/common/makefiles/Main.gmk - else - # We are building multiple configurations. - # First, find out the valid targets - # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find - # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. - all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ - $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ - grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) + ifeq ($(words $(SPEC)),1) + # We are building a single configuration. This is the normal case. Execute the Main.gmk file. + include $(root_dir)/common/makefiles/Main.gmk + else + # We are building multiple configurations. + # First, find out the valid targets + # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find + # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. + all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \ + $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \ + grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) - $(all_phony_targets): - @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ - $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true + $(all_phony_targets): + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \ + $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true - .PHONY: $(all_phony_targets) + .PHONY: $(all_phony_targets) - endif + endif endif # Include this after a potential spec file has been included so that the bundles target
--- a/common/autoconf/autogen.sh Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/autogen.sh Mon Oct 21 15:00:56 2013 +0100 @@ -62,7 +62,7 @@ # We have custom sources available; also generate configure script # with custom hooks compiled in. cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \ - sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh + sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh rm -rf autom4te.cache else echo No custom hook found: $custom_hook
--- a/common/autoconf/basics.m4 Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/basics.m4 Mon Oct 21 15:00:56 2013 +0100 @@ -24,23 +24,23 @@ # # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) -# If so, then append $1 to $2\ +# If so, then append $1 to $2 \ # Also set JVM_ARG_OK to true/false depending on outcome. AC_DEFUN([ADD_JVM_ARG_IF_OK], [ - $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD - $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD - OUTPUT=`$3 $1 -version 2>&1` - FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` - FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then - $2="[$]$2 $1" - JVM_ARG_OK=true - else - $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD - $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD - JVM_ARG_OK=false - fi + $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD + $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD + OUTPUT=`$3 $1 -version 2>&1` + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` + if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then + $2="[$]$2 $1" + JVM_ARG_OK=true + else + $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD + $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD + JVM_ARG_OK=false + fi ]) # Appends a string to a path variable, only adding the : when needed. @@ -82,7 +82,7 @@ AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) fi - $1="`cd "$path"; $THEPWDCMD -L`" + $1="`cd "$path"; $THEPWDCMD -L`" fi ]) @@ -129,78 +129,78 @@ AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.]) new_path="$path" fi - + if test "x$new_path" = x; then - AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) - has_space=`$ECHO "$complete" | $GREP " "` - if test "x$has_space" != x; then - AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.]) - fi - AC_MSG_ERROR([Cannot locate the the path of $1]) + AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) + has_space=`$ECHO "$complete" | $GREP " "` + if test "x$has_space" != x; then + AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.]) fi + AC_MSG_ERROR([Cannot locate the the path of $1]) + fi fi - # Now join together the path and the arguments once again - if test "x$arguments" != xEOL; then - new_complete="$new_path ${arguments% *}" - else - new_complete="$new_path" - fi + # Now join together the path and the arguments once again + if test "x$arguments" != xEOL; then + new_complete="$new_path ${arguments% *}" + else + new_complete="$new_path" + fi if test "x$complete" != "x$new_complete"; then - $1="$new_complete" - AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) - fi + $1="$new_complete" + AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) + fi ]) AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], [ - 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$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 - $1=`$READLINK -f [$]$1` - else - # Save the current directory for restoring afterwards - STARTDIR=$PWD - COUNTER=0 - sym_link_dir=`$DIRNAME [$]$1` - sym_link_file=`$BASENAME [$]$1` - cd $sym_link_dir - # Use -P flag to resolve symlinks in directories. - cd `$THEPWDCMD -P` - sym_link_dir=`$THEPWDCMD -P` - # 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 -P` - sym_link_file=`$BASENAME $ISLINK` - let COUNTER=COUNTER+1 - done - cd $STARTDIR - $1=$sym_link_dir/$sym_link_file + if test "x$READLINK" != x; then + $1=`$READLINK -f [$]$1` + else + # Save the current directory for restoring afterwards + STARTDIR=$PWD + COUNTER=0 + sym_link_dir=`$DIRNAME [$]$1` + sym_link_file=`$BASENAME [$]$1` + cd $sym_link_dir + # Use -P flag to resolve symlinks in directories. + cd `$THEPWDCMD -P` + sym_link_dir=`$THEPWDCMD -P` + # 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 -P` + sym_link_file=`$BASENAME $ISLINK` + let COUNTER=COUNTER+1 + done + cd $STARTDIR + $1=$sym_link_dir/$sym_link_file fi + fi ]) # Register a --with argument but mark it as deprecated @@ -214,12 +214,12 @@ AC_DEFUN_ONCE([BASIC_INIT], [ -# Save the original command line. This is passed to us by the wrapper configure script. -AC_SUBST(CONFIGURE_COMMAND_LINE) -DATE_WHEN_CONFIGURED=`LANG=C date` -AC_SUBST(DATE_WHEN_CONFIGURED) -AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.]) -AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.]) + # Save the original command line. This is passed to us by the wrapper configure script. + AC_SUBST(CONFIGURE_COMMAND_LINE) + DATE_WHEN_CONFIGURED=`LANG=C date` + AC_SUBST(DATE_WHEN_CONFIGURED) + AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.]) + AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.]) ]) # Test that variable $1 denoting a program is not empty. If empty, exit with an error. @@ -227,15 +227,15 @@ # $2: executable name to print in warning (optional) AC_DEFUN([BASIC_CHECK_NONEMPTY], [ - if test "x[$]$1" = x; then - if test "x$2" = x; then - PROG_NAME=translit($1,A-Z,a-z) - else - PROG_NAME=$2 - fi - AC_MSG_NOTICE([Could not find $PROG_NAME!]) - AC_MSG_ERROR([Cannot continue]) + if test "x[$]$1" = x; then + if test "x$2" = x; then + PROG_NAME=translit($1,A-Z,a-z) + else + PROG_NAME=$2 fi + AC_MSG_NOTICE([Could not find $PROG_NAME!]) + AC_MSG_ERROR([Cannot continue]) + fi ]) # Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY. @@ -244,8 +244,8 @@ # $2: executable name to look for AC_DEFUN([BASIC_REQUIRE_PROG], [ - AC_PATH_PROGS($1, $2) - BASIC_CHECK_NONEMPTY($1, $2) + AC_PATH_PROGS($1, $2) + BASIC_CHECK_NONEMPTY($1, $2) ]) # Setup the most fundamental tools that relies on not much else to set up, @@ -253,171 +253,171 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS], [ -# Start with tools that do not need have cross compilation support -# and can be expected to be found in the default PATH. These tools are -# used by configure. Nor are these tools expected to be found in the -# devkit from the builddeps server either, since they are -# needed to download the devkit. + # Start with tools that do not need have cross compilation support + # and can be expected to be found in the default PATH. These tools are + # used by configure. Nor are these tools expected to be found in the + # devkit from the builddeps server either, since they are + # needed to download the devkit. -# First are all the simple required tools. -BASIC_REQUIRE_PROG(BASENAME, basename) -BASIC_REQUIRE_PROG(BASH, bash) -BASIC_REQUIRE_PROG(CAT, cat) -BASIC_REQUIRE_PROG(CHMOD, chmod) -BASIC_REQUIRE_PROG(CMP, cmp) -BASIC_REQUIRE_PROG(COMM, comm) -BASIC_REQUIRE_PROG(CP, cp) -BASIC_REQUIRE_PROG(CPIO, cpio) -BASIC_REQUIRE_PROG(CUT, cut) -BASIC_REQUIRE_PROG(DATE, date) -BASIC_REQUIRE_PROG(DIFF, [gdiff diff]) -BASIC_REQUIRE_PROG(DIRNAME, dirname) -BASIC_REQUIRE_PROG(ECHO, echo) -BASIC_REQUIRE_PROG(EXPR, expr) -BASIC_REQUIRE_PROG(FILE, file) -BASIC_REQUIRE_PROG(FIND, find) -BASIC_REQUIRE_PROG(HEAD, head) -BASIC_REQUIRE_PROG(LN, ln) -BASIC_REQUIRE_PROG(LS, ls) -BASIC_REQUIRE_PROG(MKDIR, mkdir) -BASIC_REQUIRE_PROG(MKTEMP, mktemp) -BASIC_REQUIRE_PROG(MV, mv) -BASIC_REQUIRE_PROG(PRINTF, printf) -BASIC_REQUIRE_PROG(RM, rm) -BASIC_REQUIRE_PROG(SH, sh) -BASIC_REQUIRE_PROG(SORT, sort) -BASIC_REQUIRE_PROG(TAIL, tail) -BASIC_REQUIRE_PROG(TAR, tar) -BASIC_REQUIRE_PROG(TEE, tee) -BASIC_REQUIRE_PROG(TOUCH, touch) -BASIC_REQUIRE_PROG(TR, tr) -BASIC_REQUIRE_PROG(UNAME, uname) -BASIC_REQUIRE_PROG(UNIQ, uniq) -BASIC_REQUIRE_PROG(WC, wc) -BASIC_REQUIRE_PROG(WHICH, which) -BASIC_REQUIRE_PROG(XARGS, xargs) + # First are all the simple required tools. + BASIC_REQUIRE_PROG(BASENAME, basename) + BASIC_REQUIRE_PROG(BASH, bash) + BASIC_REQUIRE_PROG(CAT, cat) + BASIC_REQUIRE_PROG(CHMOD, chmod) + BASIC_REQUIRE_PROG(CMP, cmp) + BASIC_REQUIRE_PROG(COMM, comm) + BASIC_REQUIRE_PROG(CP, cp) + BASIC_REQUIRE_PROG(CPIO, cpio) + BASIC_REQUIRE_PROG(CUT, cut) + BASIC_REQUIRE_PROG(DATE, date) + BASIC_REQUIRE_PROG(DIFF, [gdiff diff]) + BASIC_REQUIRE_PROG(DIRNAME, dirname) + BASIC_REQUIRE_PROG(ECHO, echo) + BASIC_REQUIRE_PROG(EXPR, expr) + BASIC_REQUIRE_PROG(FILE, file) + BASIC_REQUIRE_PROG(FIND, find) + BASIC_REQUIRE_PROG(HEAD, head) + BASIC_REQUIRE_PROG(LN, ln) + BASIC_REQUIRE_PROG(LS, ls) + BASIC_REQUIRE_PROG(MKDIR, mkdir) + BASIC_REQUIRE_PROG(MKTEMP, mktemp) + BASIC_REQUIRE_PROG(MV, mv) + BASIC_REQUIRE_PROG(PRINTF, printf) + BASIC_REQUIRE_PROG(RM, rm) + BASIC_REQUIRE_PROG(SH, sh) + BASIC_REQUIRE_PROG(SORT, sort) + BASIC_REQUIRE_PROG(TAIL, tail) + BASIC_REQUIRE_PROG(TAR, tar) + BASIC_REQUIRE_PROG(TEE, tee) + BASIC_REQUIRE_PROG(TOUCH, touch) + BASIC_REQUIRE_PROG(TR, tr) + BASIC_REQUIRE_PROG(UNAME, uname) + BASIC_REQUIRE_PROG(UNIQ, uniq) + BASIC_REQUIRE_PROG(WC, wc) + BASIC_REQUIRE_PROG(WHICH, which) + BASIC_REQUIRE_PROG(XARGS, xargs) -# Then required tools that require some special treatment. -AC_PROG_AWK -BASIC_CHECK_NONEMPTY(AWK) -AC_PROG_GREP -BASIC_CHECK_NONEMPTY(GREP) -AC_PROG_EGREP -BASIC_CHECK_NONEMPTY(EGREP) -AC_PROG_FGREP -BASIC_CHECK_NONEMPTY(FGREP) -AC_PROG_SED -BASIC_CHECK_NONEMPTY(SED) + # Then required tools that require some special treatment. + AC_PROG_AWK + BASIC_CHECK_NONEMPTY(AWK) + AC_PROG_GREP + BASIC_CHECK_NONEMPTY(GREP) + AC_PROG_EGREP + BASIC_CHECK_NONEMPTY(EGREP) + AC_PROG_FGREP + BASIC_CHECK_NONEMPTY(FGREP) + AC_PROG_SED + BASIC_CHECK_NONEMPTY(SED) -AC_PATH_PROGS(NAWK, [nawk gawk awk]) -BASIC_CHECK_NONEMPTY(NAWK) + AC_PATH_PROGS(NAWK, [nawk gawk awk]) + BASIC_CHECK_NONEMPTY(NAWK) -# Always force rm. -RM="$RM -f" + # Always force rm. + 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 + # 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 -AC_PATH_PROG(CYGPATH, cygpath) -AC_PATH_PROG(READLINK, readlink) -AC_PATH_PROG(DF, df) -AC_PATH_PROG(SETFILE, SetFile) + # These are not required on all platforms + AC_PATH_PROG(CYGPATH, cygpath) + AC_PATH_PROG(READLINK, readlink) + AC_PATH_PROG(DF, df) + AC_PATH_PROG(SETFILE, SetFile) ]) # Setup basic configuration paths, and platform-specific stuff related to PATHs. AC_DEFUN_ONCE([BASIC_SETUP_PATHS], [ -# Locate the directory of this script. -SCRIPT="[$]0" -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` + # Locate the directory of this script. + SCRIPT="[$]0" + AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L` -# Where is the source? It is located two levels above the configure script. -CURDIR="$PWD" -cd "$AUTOCONF_DIR/../.." -SRC_ROOT="`$THEPWDCMD -L`" + # Where is the source? It is located two levels above the configure script. + CURDIR="$PWD" + cd "$AUTOCONF_DIR/../.." + SRC_ROOT="`$THEPWDCMD -L`" -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then - PATH_SEP=";" - BASIC_CHECK_PATHS_WINDOWS -else - PATH_SEP=":" -fi + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then + PATH_SEP=";" + BASIC_CHECK_PATHS_WINDOWS + else + PATH_SEP=":" + fi -AC_SUBST(SRC_ROOT) -AC_SUBST(PATH_SEP) -cd "$CURDIR" + AC_SUBST(SRC_ROOT) + AC_SUBST(PATH_SEP) + cd "$CURDIR" -BASIC_FIXUP_PATH(SRC_ROOT) -BASIC_FIXUP_PATH(CURDIR) + BASIC_FIXUP_PATH(SRC_ROOT) + BASIC_FIXUP_PATH(CURDIR) -if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then + if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then # Add extra search paths on solaris for utilities like ar and as etc... PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin" -fi + fi -# You can force the sys-root if the sys-root encoded into the cross compiler tools -# is not correct. -AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root], - [pass this sys-root to the compilers and tools (for cross-compiling)])]) + # You can force the sys-root if the sys-root encoded into the cross compiler tools + # is not correct. + AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root], + [pass this sys-root to the compilers and tools (for cross-compiling)])]) -if test "x$with_sys_root" != x; then - SYS_ROOT=$with_sys_root -else - SYS_ROOT=/ -fi -AC_SUBST(SYS_ROOT) + if test "x$with_sys_root" != x; then + SYS_ROOT=$with_sys_root + else + SYS_ROOT=/ + fi + AC_SUBST(SYS_ROOT) -AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir], - [search this directory for compilers and tools (for cross-compiling)])], - [TOOLS_DIR=$with_tools_dir] -) + AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir], + [search this directory for compilers and tools (for cross-compiling)])], + [TOOLS_DIR=$with_tools_dir] + ) -AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], - [use this directory as base for tools-dir and sys-root (for cross-compiling)])], - [ - if test "x$with_sys_root" != x; then - AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time]) - fi - BASIC_FIXUP_PATH([with_devkit]) - BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin) - if test -d "$with_devkit/$host_alias/libc"; then - SYS_ROOT=$with_devkit/$host_alias/libc - elif test -d "$with_devkit/$host/sys-root"; then - SYS_ROOT=$with_devkit/$host/sys-root - fi - ]) + AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit], + [use this directory as base for tools-dir and sys-root (for cross-compiling)])], + [ + if test "x$with_sys_root" != x; then + AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time]) + fi + BASIC_FIXUP_PATH([with_devkit]) + BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin) + if test -d "$with_devkit/$host_alias/libc"; then + SYS_ROOT=$with_devkit/$host_alias/libc + elif test -d "$with_devkit/$host/sys-root"; then + SYS_ROOT=$with_devkit/$host/sys-root + fi + ]) ]) AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR], [ -AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name], - [use this as the name of the configuration @<:@generated from important configuration options@:>@])], - [ CONF_NAME=${with_conf_name} ]) + AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name], + [use this as the name of the configuration @<:@generated from important configuration options@:>@])], + [ CONF_NAME=${with_conf_name} ]) -# Test from where we are running configure, in or outside of src root. -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ - || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ - || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then + # Test from where we are running configure, in or outside of src root. + if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \ + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \ + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then # We are running configure from the src root. # Create a default ./build/target-variant-debuglevel output root. if test "x${CONF_NAME}" = x; then - CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" + CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" fi OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" $MKDIR -p "$OUTPUT_ROOT" if test ! -d "$OUTPUT_ROOT"; then - AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) + AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) fi -else + else # We are running configure from outside of the src dir. # Then use the current directory as output dir! # If configuration is situated in normal build directory, just use the build # directory name as configuration name, otherwise use the complete path. if test "x${CONF_NAME}" = x; then - CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` + CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` fi OUTPUT_ROOT="$CURDIR" @@ -428,10 +428,10 @@ # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for # other files files_present=`$LS $OUTPUT_ROOT` - # Configure has already touched config.log and confdefs.h in the current dir when this check + # Configure has already touched config.log and confdefs.h in the current dir when this check # is performed. filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ - | $TR -d '\n'` + | $TR -d '\n'` if test "x$filtered_files" != x; then AC_MSG_NOTICE([Current directory is $CURDIR.]) AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here]) @@ -443,46 +443,46 @@ AC_MSG_ERROR([Will not continue creating configuration in $CURDIR]) fi fi -fi -AC_MSG_CHECKING([what configuration name to use]) -AC_MSG_RESULT([$CONF_NAME]) + fi + AC_MSG_CHECKING([what configuration name to use]) + AC_MSG_RESULT([$CONF_NAME]) -BASIC_FIXUP_PATH(OUTPUT_ROOT) + BASIC_FIXUP_PATH(OUTPUT_ROOT) -AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) -AC_SUBST(CONF_NAME, $CONF_NAME) -AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) + AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) + AC_SUBST(CONF_NAME, $CONF_NAME) + AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) -# Most of the probed defines are put into config.h -AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in]) -# The spec.gmk file contains all variables for the make system. -AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) -# The hotspot-spec.gmk file contains legacy variables for the hotspot make system. -AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) -# The bootcycle-spec.gmk file contains support for boot cycle builds. -AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in]) -# The compare.sh is used to compare the build output to other builds. -AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in]) -# Spec.sh is currently used by compare-objects.sh -AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in]) -# The generated Makefile knows where the spec.gmk is and where the source is. -# You can run make from the OUTPUT_ROOT, or from the top-level Makefile -# which will look for generated configurations -AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) + # Most of the probed defines are put into config.h + AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in]) + # The spec.gmk file contains all variables for the make system. + AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) + # The hotspot-spec.gmk file contains legacy variables for the hotspot make system. + AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) + # The bootcycle-spec.gmk file contains support for boot cycle builds. + AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in]) + # The compare.sh is used to compare the build output to other builds. + AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in]) + # Spec.sh is currently used by compare-objects.sh + AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in]) + # The generated Makefile knows where the spec.gmk is and where the source is. + # You can run make from the OUTPUT_ROOT, or from the top-level Makefile + # which will look for generated configurations + AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) -# Save the arguments given to us -echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments + # Save the arguments given to us + echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments ]) AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], [ -# Setup default logging of stdout and stderr to build.log in the output root. -BUILD_LOG='$(OUTPUT_ROOT)/build.log' -BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' -BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' -AC_SUBST(BUILD_LOG) -AC_SUBST(BUILD_LOG_PREVIOUS) -AC_SUBST(BUILD_LOG_WRAPPER) + # Setup default logging of stdout and stderr to build.log in the output root. + BUILD_LOG='$(OUTPUT_ROOT)/build.log' + BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' + BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' + AC_SUBST(BUILD_LOG) + AC_SUBST(BUILD_LOG_PREVIOUS) + AC_SUBST(BUILD_LOG_WRAPPER) ]) @@ -581,85 +581,85 @@ AC_DEFUN([BASIC_CHECK_FIND_DELETE], [ - # Test if find supports -delete - AC_MSG_CHECKING([if find supports -delete]) - FIND_DELETE="-delete" + # Test if find supports -delete + AC_MSG_CHECKING([if find supports -delete]) + FIND_DELETE="-delete" - DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?) + DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?) - echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete + echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete - TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` - if test -f $DELETEDIR/TestIfFindSupportsDelete; then - # No, it does not. - rm $DELETEDIR/TestIfFindSupportsDelete - FIND_DELETE="-exec rm \{\} \+" - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi - rmdir $DELETEDIR - AC_SUBST(FIND_DELETE) + TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1` + if test -f $DELETEDIR/TestIfFindSupportsDelete; then + # No, it does not. + rm $DELETEDIR/TestIfFindSupportsDelete + FIND_DELETE="-exec rm \{\} \+" + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes]) + fi + rmdir $DELETEDIR + AC_SUBST(FIND_DELETE) ]) AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS], [ -BASIC_CHECK_GNU_MAKE + BASIC_CHECK_GNU_MAKE -BASIC_CHECK_FIND_DELETE + BASIC_CHECK_FIND_DELETE -# These tools might not be installed by default, -# need hint on how to install them. -BASIC_REQUIRE_PROG(UNZIP, unzip) -BASIC_REQUIRE_PROG(ZIP, zip) + # These tools might not be installed by default, + # need hint on how to install them. + BASIC_REQUIRE_PROG(UNZIP, unzip) + BASIC_REQUIRE_PROG(ZIP, zip) -# Non-required basic tools + # Non-required basic tools -AC_PATH_PROG(LDD, ldd) -if test "x$LDD" = "x"; then + AC_PATH_PROG(LDD, ldd) + if test "x$LDD" = "x"; then # List shared lib dependencies is used for # debug output and checking for forbidden dependencies. # We can build without it. LDD="true" -fi -AC_PATH_PROG(OTOOL, otool) -if test "x$OTOOL" = "x"; then - OTOOL="true" -fi -AC_PATH_PROGS(READELF, [readelf greadelf]) -AC_PATH_PROG(HG, hg) -AC_PATH_PROG(STAT, stat) -AC_PATH_PROG(TIME, time) -# Check if it's GNU time -IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` -if test "x$IS_GNU_TIME" != x; then - IS_GNU_TIME=yes -else - IS_GNU_TIME=no -fi -AC_SUBST(IS_GNU_TIME) + fi + AC_PATH_PROG(OTOOL, otool) + if test "x$OTOOL" = "x"; then + OTOOL="true" + fi + AC_PATH_PROGS(READELF, [readelf greadelf]) + AC_PATH_PROG(HG, hg) + AC_PATH_PROG(STAT, stat) + AC_PATH_PROG(TIME, time) + # Check if it's GNU time + IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'` + if test "x$IS_GNU_TIME" != x; then + IS_GNU_TIME=yes + else + IS_GNU_TIME=no + fi + AC_SUBST(IS_GNU_TIME) -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then - BASIC_REQUIRE_PROG(COMM, comm) -fi + if test "x$OPENJDK_TARGET_OS" = "xwindows"; then + BASIC_REQUIRE_PROG(COMM, comm) + fi -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - 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]) + if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then + 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 ]) # Check if build directory is on local disk. If not possible to determine, @@ -669,8 +669,8 @@ # Argument 3: what to do otherwise (remote disk or failure) AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK], [ - # df -l lists only local disks; if the given directory is not found then - # a non-zero exit code is given + # df -l lists only local disks; if the given directory is not found then + # a non-zero exit code is given if test "x$DF" = x; then if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then # msys does not have df; use Windows "net use" instead. @@ -707,32 +707,30 @@ AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES], [ + AC_MSG_CHECKING([if build directory is on local disk]) + BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT, + [OUTPUT_DIR_IS_LOCAL="yes"], + [OUTPUT_DIR_IS_LOCAL="no"]) + AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) -AC_MSG_CHECKING([if build directory is on local disk]) -BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT, - [OUTPUT_DIR_IS_LOCAL="yes"], - [OUTPUT_DIR_IS_LOCAL="no"]) -AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) + BASIC_CHECK_SRC_PERMS -BASIC_CHECK_SRC_PERMS - -# Check if the user has any old-style ALT_ variables set. -FOUND_ALT_VARIABLES=`env | grep ^ALT_` + # Check if the user has any old-style ALT_ variables set. + FOUND_ALT_VARIABLES=`env | grep ^ALT_` -# Before generating output files, test if they exist. If they do, this is a reconfigure. -# Since we can't properly handle the dependencies for this, warn the user about the situation -if test -e $OUTPUT_ROOT/spec.gmk; then - IS_RECONFIGURE=yes -else - IS_RECONFIGURE=no -fi + # Before generating output files, test if they exist. If they do, this is a reconfigure. + # Since we can't properly handle the dependencies for this, warn the user about the situation + if test -e $OUTPUT_ROOT/spec.gmk; then + IS_RECONFIGURE=yes + else + IS_RECONFIGURE=no + fi -if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then - HIDE_PERFORMANCE_HINTS=yes -else - HIDE_PERFORMANCE_HINTS=no - # Hide it the next time around... - $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1 -fi - + if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then + HIDE_PERFORMANCE_HINTS=yes + else + HIDE_PERFORMANCE_HINTS=no + # Hide it the next time around... + $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1 + fi ])
--- a/common/autoconf/basics_windows.m4 Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/basics_windows.m4 Mon Oct 21 15:00:56 2013 +0100 @@ -145,7 +145,7 @@ # Not in mixed or Windows style, start by that. new_path=`cmd //c echo $path` fi - + BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) if test "x$path" != "x$new_path"; then @@ -175,8 +175,8 @@ # bat and cmd files are not always considered executable in cygwin causing which # to not find them if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then new_path=`$CYGPATH -u "$path"` fi if test "x$new_path" = x; then @@ -191,8 +191,8 @@ # bat and cmd files are not always considered executable in cygwin causing which # to not find them if test "x$new_path" = x \ - && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ - && test "x`$LS \"$path\" 2>/dev/null`" != x; then + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then new_path=`$CYGPATH -u "$path"` fi if test "x$new_path" = x; then @@ -218,9 +218,9 @@ # Short path failed, file does not exist as specified. # Try adding .exe or .cmd if test -f "${new_path}.exe"; then - input_to_shortpath="${new_path}.exe" + input_to_shortpath="${new_path}.exe" elif test -f "${new_path}.cmd"; then - input_to_shortpath="${new_path}.cmd" + input_to_shortpath="${new_path}.cmd" else AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.]) AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found]) @@ -254,7 +254,7 @@ # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` - + if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -264,9 +264,9 @@ arguments="EOL" new_path="$path" BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) - + new_path=`$WHICH "$new_path" 2> /dev/null` - + if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) @@ -302,7 +302,7 @@ [ SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m` 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 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then @@ -311,14 +311,14 @@ AC_MSG_RESULT([$CYGWIN_VERSION]) WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - + CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` if test "x$CYGWIN_VERSION_OK" = x; then AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) AC_MSG_ERROR([Cannot continue]) fi if test "x$CYGPATH" = x; then - AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) + AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) fi AC_MSG_CHECKING([cygwin root directory as unix-style path]) # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away @@ -329,13 +329,13 @@ WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH" test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/` if test "x$test_cygdrive_prefix" = x; then - AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.]) + AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.]) fi elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then AC_MSG_CHECKING([msys release]) MSYS_VERSION=`$UNAME -r` AC_MSG_RESULT([$MSYS_VERSION]) - + WINDOWS_ENV_VENDOR='msys' WINDOWS_ENV_VERSION="$MSYS_VERSION" @@ -367,12 +367,12 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH], [ -# When using cygwin or msys, we need a wrapper binary that renames -# /cygdrive/c/ arguments into c:/ arguments and peeks into -# @files and rewrites these too! This wrapper binary is -# called fixpath. -FIXPATH= -if test "x$OPENJDK_BUILD_OS" = xwindows; then + # When using cygwin or msys, we need a wrapper binary that renames + # /cygdrive/c/ arguments into c:/ arguments and peeks into + # @files and rewrites these too! This wrapper binary is + # called fixpath. + FIXPATH= + if test "x$OPENJDK_BUILD_OS" = xwindows; then AC_MSG_CHECKING([if fixpath can be created]) FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c" FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe" @@ -389,7 +389,7 @@ # @ was chosen as separator to minimize risk of other tools messing around with it all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq` fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'` - + FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list" fi rm -f $OUTPUT_ROOT/fixpath* @@ -397,24 +397,24 @@ $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1 cd $CURDIR - if test ! -x $OUTPUT_ROOT/fixpath.exe; then - AC_MSG_RESULT([no]) - cat $OUTPUT_ROOT/fixpath1.log - AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe]) + if test ! -x $OUTPUT_ROOT/fixpath.exe; then + AC_MSG_RESULT([no]) + cat $OUTPUT_ROOT/fixpath1.log + AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe]) fi AC_MSG_RESULT([yes]) AC_MSG_CHECKING([if fixpath.exe works]) cd $OUTPUT_ROOT - $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 + $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 cd $CURDIR - if test ! -x $OUTPUT_ROOT/fixpath2.exe; then - AC_MSG_RESULT([no]) - cat $OUTPUT_ROOT/fixpath2.log - AC_MSG_ERROR([fixpath did not work!]) + if test ! -x $OUTPUT_ROOT/fixpath2.exe; then + AC_MSG_RESULT([no]) + cat $OUTPUT_ROOT/fixpath2.log + AC_MSG_ERROR([fixpath did not work!]) fi AC_MSG_RESULT([yes]) rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj -fi + fi -AC_SUBST(FIXPATH) + AC_SUBST(FIXPATH) ])
--- a/common/autoconf/boot-jdk.m4 Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/boot-jdk.m4 Mon Oct 21 15:00:56 2013 +0100 @@ -44,7 +44,7 @@ AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring]) AC_MSG_NOTICE([(This might be an JRE instead of an JDK)]) BOOT_JDK_FOUND=no - else + else # Do we have an rt.jar? (On MacOSX it is called classes.jar) if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring]) @@ -79,70 +79,70 @@ # Test: Is bootjdk explicitely set by command line arguments? AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS], [ -if test "x$with_boot_jdk" != x; then + if test "x$with_boot_jdk" != x; then BOOT_JDK=$with_boot_jdk BOOT_JDK_FOUND=maybe AC_MSG_NOTICE([Found potential Boot JDK using configure arguments]) -fi + fi ]) # Test: Is bootjdk available from builddeps? AC_DEFUN([BOOTJDK_CHECK_BUILDDEPS], [ - BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no]) + BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no]) ]) # Test: Is $JAVA_HOME set? AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME], [ - if test "x$JAVA_HOME" != x; then - JAVA_HOME_PROCESSED="$JAVA_HOME" - BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED) - if test ! -d "$JAVA_HOME_PROCESSED"; then - AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!]) - else - # Aha, the user has set a JAVA_HOME - # let us use that as the Boot JDK. - BOOT_JDK="$JAVA_HOME_PROCESSED" - BOOT_JDK_FOUND=maybe - AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME]) - fi + if test "x$JAVA_HOME" != x; then + JAVA_HOME_PROCESSED="$JAVA_HOME" + BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED) + if test ! -d "$JAVA_HOME_PROCESSED"; then + AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!]) + else + # Aha, the user has set a JAVA_HOME + # let us use that as the Boot JDK. + BOOT_JDK="$JAVA_HOME_PROCESSED" + BOOT_JDK_FOUND=maybe + AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME]) fi + fi ]) # Test: Is there a java or javac in the PATH, which is a symlink to the JDK? AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK], [ - AC_PATH_PROG(JAVAC_CHECK, javac) - AC_PATH_PROG(JAVA_CHECK, java) - BINARY="$JAVAC_CHECK" - if test "x$JAVAC_CHECK" = x; then - BINARY="$JAVA_CHECK" + AC_PATH_PROG(JAVAC_CHECK, javac) + AC_PATH_PROG(JAVA_CHECK, java) + BINARY="$JAVAC_CHECK" + if test "x$JAVAC_CHECK" = x; then + BINARY="$JAVA_CHECK" + fi + if test "x$BINARY" != x; then + # So there is a java(c) binary, it might be part of a JDK. + # Lets find the JDK/JRE directory by following symbolic links. + # Linux/GNU systems often have links from /usr/bin/java to + # /etc/alternatives/java to the real JDK binary. + BASIC_REMOVE_SYMBOLIC_LINKS(BINARY) + BOOT_JDK=`dirname "$BINARY"` + BOOT_JDK=`cd "$BOOT_JDK/.."; pwd` + if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then + # Looks like we found ourselves an JDK + BOOT_JDK_FOUND=maybe + AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH]) fi - if test "x$BINARY" != x; then - # So there is a java(c) binary, it might be part of a JDK. - # Lets find the JDK/JRE directory by following symbolic links. - # Linux/GNU systems often have links from /usr/bin/java to - # /etc/alternatives/java to the real JDK binary. - BASIC_REMOVE_SYMBOLIC_LINKS(BINARY) - BOOT_JDK=`dirname "$BINARY"` - BOOT_JDK=`cd "$BOOT_JDK/.."; pwd` - if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then - # Looks like we found ourselves an JDK - BOOT_JDK_FOUND=maybe - AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH]) - fi - fi + fi ]) # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) AC_DEFUN([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME], [ - if test -x /usr/libexec/java_home; then - BOOT_JDK=`/usr/libexec/java_home` - BOOT_JDK_FOUND=maybe - AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home]) - fi + if test -x /usr/libexec/java_home; then + BOOT_JDK=`/usr/libexec/java_home` + BOOT_JDK_FOUND=maybe + AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home]) + fi ]) # Look for a jdk in the given path. If there are multiple, try to select the newest. @@ -204,123 +204,123 @@ AC_MSG_CHECKING([for $2 in Boot JDK]) $1=$BOOT_JDK/bin/$2 if test ! -x [$]$1; then - AC_MSG_RESULT(not found) - AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk]) - AC_MSG_ERROR([Could not find $2 in the Boot JDK]) + AC_MSG_RESULT(not found) + AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk]) + AC_MSG_ERROR([Could not find $2 in the Boot JDK]) fi AC_MSG_RESULT(ok) ]) ############################################################################### # -# We need a Boot JDK to bootstrap the build. +# We need a Boot JDK to bootstrap the build. # AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK], [ -BOOT_JDK_FOUND=no -AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk], - [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])]) + BOOT_JDK_FOUND=no + AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk], + [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])]) -# We look for the Boot JDK through various means, going from more certain to -# more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if -# we detected something (if so, the path to the jdk is in BOOT_JDK). But we -# must check if this is indeed valid; otherwise we'll continue looking. + # We look for the Boot JDK through various means, going from more certain to + # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if + # we detected something (if so, the path to the jdk is in BOOT_JDK). But we + # must check if this is indeed valid; otherwise we'll continue looking. -# Test: Is bootjdk explicitely set by command line arguments? -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS]) -if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then - # Having specified an argument which is incorrect will produce an instant failure; - # we should not go on looking - AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK]) -fi + # Test: Is bootjdk explicitely set by command line arguments? + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS]) + if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then + # Having specified an argument which is incorrect will produce an instant failure; + # we should not go on looking + AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK]) + fi -# Test: Is bootjdk available from builddeps? -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS]) + # Test: Is bootjdk available from builddeps? + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS]) -# Test: Is $JAVA_HOME set? -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME]) + # Test: Is $JAVA_HOME set? + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME]) -# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME]) + # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX) + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME]) -# Test: Is there a java or javac in the PATH, which is a symlink to the JDK? -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK]) + # Test: Is there a java or javac in the PATH, which is a symlink to the JDK? + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK]) -# Test: Is there a JDK installed in default, well-known locations? -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS]) + # Test: Is there a JDK installed in default, well-known locations? + BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS]) -# If we haven't found anything yet, we've truly lost. Give up. -if test "x$BOOT_JDK_FOUND" = xno; then - HELP_MSG_MISSING_DEPENDENCY([openjdk]) - AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) - AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) - AC_MSG_ERROR([Cannot continue]) -fi + # If we haven't found anything yet, we've truly lost. Give up. + if test "x$BOOT_JDK_FOUND" = xno; then + HELP_MSG_MISSING_DEPENDENCY([openjdk]) + AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) + AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) + AC_MSG_ERROR([Cannot continue]) + fi -# Setup proper paths for what we found -BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" -if test ! -f "$BOOT_RTJAR"; then + # Setup proper paths for what we found + BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" + if test ! -f "$BOOT_RTJAR"; then # On MacOSX it is called classes.jar BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar" if test -f "$BOOT_RTJAR"; then - # Remove the .. + # Remove the .. BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}" fi -fi -BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" -BOOT_JDK="$BOOT_JDK" -AC_SUBST(BOOT_RTJAR) -AC_SUBST(BOOT_TOOLSJAR) -AC_SUBST(BOOT_JDK) + fi + BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" + BOOT_JDK="$BOOT_JDK" + AC_SUBST(BOOT_RTJAR) + AC_SUBST(BOOT_TOOLSJAR) + AC_SUBST(BOOT_JDK) -# Setup tools from the Boot JDK. -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java) -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac) -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah) -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap) -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar) -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic) -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii) + # Setup tools from the Boot JDK. + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java) + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac) + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah) + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap) + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar) + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic) + BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii) -# Finally, set some other options... + # Finally, set some other options... -# When compiling code to be executed by the Boot JDK, force jdk7 compatibility. -BOOT_JDK_SOURCETARGET="-source 7 -target 7" -AC_SUBST(BOOT_JDK_SOURCETARGET) -AC_SUBST(JAVAC_FLAGS) + # When compiling code to be executed by the Boot JDK, force jdk7 compatibility. + BOOT_JDK_SOURCETARGET="-source 7 -target 7" + AC_SUBST(BOOT_JDK_SOURCETARGET) + AC_SUBST(JAVAC_FLAGS) ]) AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS], [ -############################################################################## -# -# Specify options for anything that is run with the Boot JDK. -# -AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs], - [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values, - e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])]) + ############################################################################## + # + # Specify options for anything that is run with the Boot JDK. + # + AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs], + [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values, + e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])]) -if test "x$with_boot_jdk_jvmargs" = x; then + if test "x$with_boot_jdk_jvmargs" = x; then # Not all JVM:s accept the same arguments on the command line. # OpenJDK specific increase in thread stack for JDK build, # well more specifically, when running javac. if test "x$BUILD_NUM_BITS" = x32; then - STACK_SIZE=768 + STACK_SIZE=768 else - # Running Javac on a JVM on a 64-bit machine, the stack takes more space - # since 64-bit pointers are pushed on the stach. Apparently, we need - # to increase the stack space when javacing the JDK.... - STACK_SIZE=1536 + # Running Javac on a JVM on a 64-bit machine, the stack takes more space + # since 64-bit pointers are pushed on the stach. Apparently, we need + # to increase the stack space when javacing the JDK.... + STACK_SIZE=1536 fi # Minimum amount of heap memory. ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA]) if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - # Why does macosx need more heap? Its the huge JDK batch. - ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) + # Why does macosx need more heap? Its the huge JDK batch. + ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA]) else - ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA]) + ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA]) fi # When is adding -client something that speeds up the JVM? # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) @@ -329,7 +329,7 @@ ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA]) # Disable special log output when a debug build is used as Boot JDK... ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA]) -fi + fi -AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs) + AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs) ])
--- a/common/autoconf/bootcycle-spec.gmk.in Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/bootcycle-spec.gmk.in Mon Oct 21 15:00:56 2013 +0100 @@ -36,7 +36,7 @@ JAVA_EXEC_POS=1 endif ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA))) - $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified) + $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified) endif
--- a/common/autoconf/build-aux/config.guess Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/build-aux/config.guess Mon Oct 21 15:00:56 2013 +0100 @@ -58,6 +58,6 @@ OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'` ;; esac -fi +fi echo $OUT
--- a/common/autoconf/build-performance.m4 Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/build-performance.m4 Mon Oct 21 15:00:56 2013 +0100 @@ -25,78 +25,77 @@ AC_DEFUN([BPERF_CHECK_CORES], [ - AC_MSG_CHECKING([for number of cores]) - NUM_CORES=1 - FOUND_CORES=no - - if test -f /proc/cpuinfo; then - # Looks like a Linux (or cygwin) system - NUM_CORES=`cat /proc/cpuinfo | grep -c processor` - FOUND_CORES=yes - elif test -x /usr/sbin/psrinfo; then - # Looks like a Solaris system - NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` - FOUND_CORES=yes - elif test -x /usr/sbin/system_profiler; then - # Looks like a MacOSX system - NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` - FOUND_CORES=yes - elif test -n "$NUMBER_OF_PROCESSORS"; then - # On windows, look in the env - NUM_CORES=$NUMBER_OF_PROCESSORS - FOUND_CORES=yes - fi + AC_MSG_CHECKING([for number of cores]) + NUM_CORES=1 + FOUND_CORES=no - if test "x$FOUND_CORES" = xyes; then - AC_MSG_RESULT([$NUM_CORES]) - else - AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) - AC_MSG_WARN([This will disable all parallelism from build!]) - fi + if test -f /proc/cpuinfo; then + # Looks like a Linux (or cygwin) system + NUM_CORES=`cat /proc/cpuinfo | grep -c processor` + FOUND_CORES=yes + elif test -x /usr/sbin/psrinfo; then + # Looks like a Solaris system + NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` + FOUND_CORES=yes + elif test -x /usr/sbin/system_profiler; then + # Looks like a MacOSX system + NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk '{print [$]5}'` + FOUND_CORES=yes + elif test -n "$NUMBER_OF_PROCESSORS"; then + # On windows, look in the env + NUM_CORES=$NUMBER_OF_PROCESSORS + FOUND_CORES=yes + fi + if test "x$FOUND_CORES" = xyes; then + AC_MSG_RESULT([$NUM_CORES]) + else + AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) + AC_MSG_WARN([This will disable all parallelism from build!]) + fi ]) AC_DEFUN([BPERF_CHECK_MEMORY_SIZE], [ - AC_MSG_CHECKING([for memory size]) - # Default to 1024 MB - MEMORY_SIZE=1024 - FOUND_MEM=no - - if test -f /proc/meminfo; then - # Looks like a Linux (or cygwin) system - MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` - MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` - FOUND_MEM=yes - elif test -x /usr/sbin/prtconf; then - # Looks like a Solaris system - MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'` - FOUND_MEM=yes - elif test -x /usr/sbin/system_profiler; then - # Looks like a MacOSX system - MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'` - MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` - FOUND_MEM=yes - elif test "x$OPENJDK_BUILD_OS" = xwindows; then - # Windows, but without cygwin - MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` - MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` - FOUND_MEM=yes - fi + AC_MSG_CHECKING([for memory size]) + # Default to 1024 MB + MEMORY_SIZE=1024 + FOUND_MEM=no - if test "x$FOUND_MEM" = xyes; then - AC_MSG_RESULT([$MEMORY_SIZE MB]) - else - AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) - AC_MSG_WARN([This might seriously impact build performance!]) - fi + if test -f /proc/meminfo; then + # Looks like a Linux (or cygwin) system + MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` + FOUND_MEM=yes + elif test -x /usr/sbin/prtconf; then + # Looks like a Solaris system + MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'` + FOUND_MEM=yes + elif test -x /usr/sbin/system_profiler; then + # Looks like a MacOSX system + MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk '{print [$]2}'` + MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024` + FOUND_MEM=yes + elif test "x$OPENJDK_BUILD_OS" = xwindows; then + # Windows, but without cygwin + MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` + MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` + FOUND_MEM=yes + fi + + if test "x$FOUND_MEM" = xyes; then + AC_MSG_RESULT([$MEMORY_SIZE MB]) + else + AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB]) + AC_MSG_WARN([This might seriously impact build performance!]) + fi ]) AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES], [ # How many cores do we have on this build system? AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores], - [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) + [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) if test "x$with_num_cores" = x; then # The number of cores were not specified, try to probe them. BPERF_CHECK_CORES @@ -110,7 +109,7 @@ [ # How much memory do we have on this build system? AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size], - [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])]) + [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])]) if test "x$with_memory_size" = x; then # The memory size was not specified, try to probe it. BPERF_CHECK_MEMORY_SIZE @@ -122,10 +121,10 @@ AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS], [ - # Provide a decent default number of parallel jobs for make depending on + # Provide a decent default number of parallel jobs for make depending on # number of cores, amount of memory and machine architecture. AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs], - [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])]) + [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])]) if test "x$with_jobs" = x; then # Number of jobs was not specified, calculate. AC_MSG_CHECKING([for appropriate number of jobs to run in parallel]) @@ -157,179 +156,178 @@ AC_DEFUN([BPERF_SETUP_CCACHE], [ - AC_ARG_ENABLE([ccache], - [AS_HELP_STRING([--disable-ccache], - [disable using ccache to speed up recompilations @<:@enabled@:>@])], - [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes]) - if test "x$ENABLE_CCACHE" = xyes; then - OLD_PATH="$PATH" - if test "x$TOOLS_DIR" != x; then - PATH=$TOOLS_DIR:$PATH - fi - AC_PATH_PROG(CCACHE, ccache) - PATH="$OLD_PATH" - else - AC_MSG_CHECKING([for ccache]) - AC_MSG_RESULT([explicitly disabled]) - CCACHE= - fi - AC_SUBST(CCACHE) + AC_ARG_ENABLE([ccache], + [AS_HELP_STRING([--disable-ccache], + [disable using ccache to speed up recompilations @<:@enabled@:>@])], + [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes]) + if test "x$ENABLE_CCACHE" = xyes; then + OLD_PATH="$PATH" + if test "x$TOOLS_DIR" != x; then + PATH=$TOOLS_DIR:$PATH + fi + AC_PATH_PROG(CCACHE, ccache) + PATH="$OLD_PATH" + else + AC_MSG_CHECKING([for ccache]) + AC_MSG_RESULT([explicitly disabled]) + CCACHE= + fi + AC_SUBST(CCACHE) - AC_ARG_WITH([ccache-dir], - [AS_HELP_STRING([--with-ccache-dir], - [where to store ccache files @<:@~/.ccache@:>@])]) + AC_ARG_WITH([ccache-dir], + [AS_HELP_STRING([--with-ccache-dir], + [where to store ccache files @<:@~/.ccache@:>@])]) - if test "x$with_ccache_dir" != x; then - # When using a non home ccache directory, assume the use is to share ccache files - # with other users. Thus change the umask. - SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" - fi - CCACHE_FOUND="" - if test "x$CCACHE" != x; then - BPERF_SETUP_CCACHE_USAGE - fi + if test "x$with_ccache_dir" != x; then + # When using a non home ccache directory, assume the use is to share ccache files + # with other users. Thus change the umask. + SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" + fi + CCACHE_FOUND="" + if test "x$CCACHE" != x; then + BPERF_SETUP_CCACHE_USAGE + fi ]) AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], [ - if test "x$CCACHE" != x; then - CCACHE_FOUND="true" - # Only use ccache if it is 3.1.4 or later, which supports - # precompiled headers. - AC_MSG_CHECKING([if ccache supports precompiled headers]) - HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` - if test "x$HAS_GOOD_CCACHE" = x; then - AC_MSG_RESULT([no, disabling ccache]) - CCACHE= - else - AC_MSG_RESULT([yes]) - AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) - PUSHED_FLAGS="$CXXFLAGS" - CXXFLAGS="-fpch-preprocess $CXXFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) - CXXFLAGS="$PUSHED_FLAGS" - if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no, disabling ccaching of precompiled headers]) - CCACHE= - fi - fi + if test "x$CCACHE" != x; then + CCACHE_FOUND="true" + # Only use ccache if it is 3.1.4 or later, which supports + # precompiled headers. + AC_MSG_CHECKING([if ccache supports precompiled headers]) + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null` + if test "x$HAS_GOOD_CCACHE" = x; then + AC_MSG_RESULT([no, disabling ccache]) + CCACHE= + else + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) + PUSHED_FLAGS="$CXXFLAGS" + CXXFLAGS="-fpch-preprocess $CXXFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) + CXXFLAGS="$PUSHED_FLAGS" + if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no, disabling ccaching of precompiled headers]) + CCACHE= + fi fi - - if test "x$CCACHE" != x; then - CCACHE_SLOPPINESS=time_macros - CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE" - CCACHE_FLAGS=-fpch-preprocess + fi - if test "x$SET_CCACHE_DIR" != x; then - mkdir -p $CCACHE_DIR > /dev/null 2>&1 - chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 - fi + if test "x$CCACHE" != x; then + CCACHE_SLOPPINESS=time_macros + CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE" + CCACHE_FLAGS=-fpch-preprocess + + if test "x$SET_CCACHE_DIR" != x; then + mkdir -p $CCACHE_DIR > /dev/null 2>&1 + chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 fi + fi ]) AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS], [ - -############################################################################### -# -# Can the C/C++ compiler use precompiled headers? -# -AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], - [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], - [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) -USE_PRECOMPILED_HEADER=1 -if test "x$ENABLE_PRECOMPH" = xno; then + ############################################################################### + # + # Can the C/C++ compiler use precompiled headers? + # + AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], + [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], + [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) + + USE_PRECOMPILED_HEADER=1 + if test "x$ENABLE_PRECOMPH" = xno; then USE_PRECOMPILED_HEADER=0 -fi + fi -if test "x$ENABLE_PRECOMPH" = xyes; then + if test "x$ENABLE_PRECOMPH" = xyes; then # Check that the compiler actually supports precomp headers. if test "x$GCC" = xyes; then - AC_MSG_CHECKING([that precompiled headers work]) - echo "int alfa();" > conftest.h - $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD - if test ! -f conftest.hpp.gch; then - USE_PRECOMPILED_HEADER=0 - AC_MSG_RESULT([no]) - else - AC_MSG_RESULT([yes]) - fi - rm -f conftest.h conftest.hpp.gch + AC_MSG_CHECKING([that precompiled headers work]) + echo "int alfa();" > conftest.h + $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD + if test ! -f conftest.hpp.gch; then + USE_PRECOMPILED_HEADER=0 + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes]) + fi + rm -f conftest.h conftest.hpp.gch fi -fi + fi -AC_SUBST(USE_PRECOMPILED_HEADER) + AC_SUBST(USE_PRECOMPILED_HEADER) ]) AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC], [ -AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], - [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) + AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], + [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) -if test "x$with_sjavac_server_java" != x; then + if test "x$with_sjavac_server_java" != x; then SJAVAC_SERVER_JAVA="$with_sjavac_server_java" FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""` if test "x$FOUND_VERSION" = x; then - AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) + AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) fi -else + else SJAVAC_SERVER_JAVA="" # Hotspot specific options. ADD_JVM_ARG_IF_OK([-verbosegc],SJAVAC_SERVER_JAVA,[$JAVA]) # JRockit specific options. ADD_JVM_ARG_IF_OK([-Xverbose:gc],SJAVAC_SERVER_JAVA,[$JAVA]) SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA" -fi -AC_SUBST(SJAVAC_SERVER_JAVA) + fi + AC_SUBST(SJAVAC_SERVER_JAVA) -if test "$MEMORY_SIZE" -gt "2500"; then + if test "$MEMORY_SIZE" -gt "2500"; then ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) if test "$JVM_ARG_OK" = true; then - JVM_64BIT=true - JVM_ARG_OK=false - fi + JVM_64BIT=true + JVM_ARG_OK=false fi + fi -if test "$JVM_64BIT" = true; then + if test "$JVM_64BIT" = true; then if test "$MEMORY_SIZE" -gt "17000"; then - ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) + ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) fi if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then - ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) + ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) fi if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then - ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) + ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) fi if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then - ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) + ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) fi -fi -if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then + fi + if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) -fi -if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then + fi + if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) -fi -if test "$JVM_ARG_OK" = false; then + fi + if test "$JVM_ARG_OK" = false; then ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) -fi + fi -AC_MSG_CHECKING([whether to use sjavac]) -AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], - [use sjavac to do fast incremental compiles @<:@disabled@:>@])], - [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) -AC_MSG_RESULT([$ENABLE_SJAVAC]) -AC_SUBST(ENABLE_SJAVAC) + AC_MSG_CHECKING([whether to use sjavac]) + AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], + [use sjavac to do fast incremental compiles @<:@disabled@:>@])], + [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) + AC_MSG_RESULT([$ENABLE_SJAVAC]) + AC_SUBST(ENABLE_SJAVAC) -if test "x$ENABLE_SJAVAC" = xyes; then + if test "x$ENABLE_SJAVAC" = xyes; then SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers" -else + else SJAVAC_SERVER_DIR= -fi -AC_SUBST(SJAVAC_SERVER_DIR) - + fi + AC_SUBST(SJAVAC_SERVER_DIR) ])
--- a/common/autoconf/builddeps.conf.example Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/builddeps.conf.example Mon Oct 21 15:00:56 2013 +0100 @@ -34,7 +34,7 @@ # If no rewrite was found, then rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10 - + # The needed cups builddeps are platform independent header files. # I.e. they need not be part of the devkit. builddep_cups=lib/cups_1_3_9.zip
--- a/common/autoconf/builddeps.conf.nfs.example Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/builddeps.conf.nfs.example Mon Oct 21 15:00:56 2013 +0100 @@ -29,7 +29,7 @@ REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10 - + DEVTOOLS=/java/devtools builddep_cups=${DEVTOOLS}/linux/cups/include
--- a/common/autoconf/builddeps.m4 Mon Oct 21 09:56:06 2013 +0200 +++ b/common/autoconf/builddeps.m4 Mon Oct 21 15:00:56 2013 +0100 @@ -25,223 +25,223 @@ AC_DEFUN_ONCE([BDEPS_SCAN_FOR_BUILDDEPS], [ - define(LIST_OF_BUILD_DEPENDENCIES,) - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then - if test "x$with_builddeps_conf" != x; then - AC_MSG_CHECKING([for supplied builddeps configuration file]) - builddepsfile=$with_builddeps_conf - if test -s $builddepsfile; then - . $builddepsfile - AC_MSG_RESULT([loaded!]) - else - AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!]) - fi - else - AC_MSG_CHECKING([for builddeps.conf files in sources...]) - builddepsfile=`mktemp` - touch $builddepsfile - # Put all found confs into a single file. - find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile - # Source the file to acquire the variables - if test -s $builddepsfile; then - . $builddepsfile - AC_MSG_RESULT([found at least one!]) - else - AC_MSG_ERROR([Could not find any builddeps.conf at all!]) - fi - fi - # Create build and target names that use _ instead of "-" and ".". - # This is necessary to use them in variable names. - build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` - target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` - # Extract rewrite information for build and target - eval rewritten_build=\${REWRITE_${build_var}} - if test "x$rewritten_build" = x; then - rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} - echo Build stays the same $rewritten_build - else - echo Rewriting build for builddeps into $rewritten_build - fi - eval rewritten_target=\${REWRITE_${target_var}} - if test "x$rewritten_target" = x; then - rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} - echo Target stays the same $rewritten_target - else - echo Rewriting target for builddeps into $rewritten_target - fi - rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` - rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'` + define(LIST_OF_BUILD_DEPENDENCIES,) + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then + if test "x$with_builddeps_conf" != x; then + AC_MSG_CHECKING([for supplied builddeps configuration file]) + builddepsfile=$with_builddeps_conf + if test -s $builddepsfile; then + . $builddepsfile + AC_MSG_RESULT([loaded!]) + else + AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!]) + fi + else + AC_MSG_CHECKING([for builddeps.conf files in sources...]) + builddepsfile=`mktemp` + touch $builddepsfile + # Put all found confs into a single file. + find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile + # Source the file to acquire the variables + if test -s $builddepsfile; then + . $builddepsfile + AC_MSG_RESULT([found at least one!]) + else + AC_MSG_ERROR([Could not find any builddeps.conf at all!]) + fi fi - AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip]) - if test "x$BDEPS_UNZIP" = x7z; then - BDEPS_UNZIP="7z x" + # Create build and target names that use _ instead of "-" and ".". + # This is necessary to use them in variable names. + build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` + target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` + # Extract rewrite information for build and target + eval rewritten_build=\${REWRITE_${build_var}} + if test "x$rewritten_build" = x; then + rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} + echo Build stays the same $rewritten_build + else + echo Rewriting build for builddeps into $rewritten_build fi + eval rewritten_target=\${REWRITE_${target_var}} + if test "x$rewritten_target" = x; then + rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} + echo Target stays the same $rewritten_target + else + echo Rewriting target for builddeps into $rewritten_target + fi + rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` + rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'` + fi + AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip]) + if test "x$BDEPS_UNZIP" = x7z; then + BDEPS_UNZIP="7z x" + fi - AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp]) + AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp]) ]) AC_DEFUN([BDEPS_FTPGET], [ - # $1 is the ftp://abuilddeps.server.com/libs/cups.zip - # $2 is the local file name for the downloaded file. - VALID_TOOL=no - if test "x$BDEPS_FTP" = xwget; then - VALID_TOOL=yes - wget -O $2 $1 - fi - if test "x$BDEPS_FTP" = xlftp; then - VALID_TOOL=yes - lftp -c "get $1 -o $2" + # $1 is the ftp://abuilddeps.server.com/libs/cups.zip + # $2 is the local file name for the downloaded file. + VALID_TOOL=no + if test "x$BDEPS_FTP" = xwget; then + VALID_TOOL=yes + wget -O $2 $1 + fi + if test "x$BDEPS_FTP" = xlftp; then + VALID_TOOL=yes + lftp -c "get $1 -o $2" + fi + if test "x$BDEPS_FTP" = xftp; then + VALID_TOOL=yes + FTPSERVER=`echo $1 | cut -f 3 -d '/'` + FTPPATH=`echo $1 | cut -f 4- -d '/'` + FTPUSERPWD=${FTPSERVER%%@*} + if test "x$FTPSERVER" != "x$FTPUSERPWD"; then + FTPUSER=${userpwd%%:*} + FTPPWD=${userpwd#*@} + FTPSERVER=${FTPSERVER#*@} + else + FTPUSER=ftp + FTPPWD=ftp fi - if test "x$BDEPS_FTP" = xftp; then - VALID_TOOL=yes - FTPSERVER=`echo $1 | cut -f 3 -d '/'` - FTPPATH=`echo $1 | cut -f 4- -d '/'` - FTPUSERPWD=${FTPSERVER%%@*} - if test "x$FTPSERVER" != "x$FTPUSERPWD"; then - FTPUSER=${userpwd%%:*} - FTPPWD=${userpwd#*@} - FTPSERVER=${FTPSERVER#*@} - else - FTPUSER=ftp - FTPPWD=ftp - fi - # the "pass" command does not work on some - # ftp clients (read ftp.exe) but if it works, - # passive mode is better! - (\ - echo "user $FTPUSER $FTPPWD" ;\ - echo "pass" ;\ - echo "bin" ;\ - echo "get $FTPPATH $2" ;\ - ) | ftp -in $FTPSERVER - fi - if test "x$VALID_TOOL" != xyes; then - AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP]) - fi + # the "pass" command does not work on some + # ftp clients (read ftp.exe) but if it works, + # passive mode is better! + ( \ + echo "user $FTPUSER $FTPPWD" ; \ + echo "pass" ; \ + echo "bin" ; \ + echo "get $FTPPATH $2" ; \ + ) | ftp -in $FTPSERVER + fi + if test "x$VALID_TOOL" != xyes; then + AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP]) + fi ]) AC_DEFUN([BDEPS_CHECK_MODULE], [ - define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n']) - if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then - # Source the builddeps file again, to make sure it uses the latest variables! - . $builddepsfile - # Look for a target and build machine specific resource! - eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}} - if test "x$resource" = x; then - # Ok, lets instead look for a target specific resource - eval resource=\${builddep_$2_TARGET_${rewritten_target_var}} - fi - if test "x$resource" = x; then - # Ok, lets instead look for a build specific resource - eval resource=\${builddep_$2_BUILD_${rewritten_build_var}} - fi - if test "x$resource" = x; then - # Ok, lets instead look for a generic resource - # (The $2 comes from M4 and not the shell, thus no need for eval here.) - resource=${builddep_$2} - fi - if test "x$resource" != x; then - AC_MSG_NOTICE([Using builddeps $resource for $2]) - # If the resource in the builddeps.conf file is an existing directory, - # for example /java/linux/cups - if test -d ${resource}; then - depdir=${resource} - else - BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir) - fi - # Source the builddeps file again, because in the previous command, the depdir - # was updated to point at the current build dependency install directory. - . $builddepsfile - # Now extract variables from the builddeps.conf files. - theroot=${builddep_$2_ROOT} - thecflags=${builddep_$2_CFLAGS} - thelibs=${builddep_$2_LIBS} - if test "x$depdir" = x; then - AC_MSG_ERROR([Could not download build dependency $2]) - fi - $1=$depdir - if test "x$theroot" != x; then - $1="$theroot" - fi - if test "x$thecflags" != x; then - $1_CFLAGS="$thecflags" - fi - if test "x$thelibs" != x; then - $1_LIBS="$thelibs" - fi - m4_default([$4], [:]) - m4_ifvaln([$5], [else $5]) - fi - m4_ifvaln([$5], [else $5]) + define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n']) + if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then + # Source the builddeps file again, to make sure it uses the latest variables! + . $builddepsfile + # Look for a target and build machine specific resource! + eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}} + if test "x$resource" = x; then + # Ok, lets instead look for a target specific resource + eval resource=\${builddep_$2_TARGET_${rewritten_target_var}} + fi + if test "x$resource" = x; then + # Ok, lets instead look for a build specific resource + eval resource=\${builddep_$2_BUILD_${rewritten_build_var}} + fi + if test "x$resource" = x; then + # Ok, lets instead look for a generic resource + # (The $2 comes from M4 and not the shell, thus no need for eval here.) + resource=${builddep_$2} fi + if test "x$resource" != x; then + AC_MSG_NOTICE([Using builddeps $resource for $2]) + # If the resource in the builddeps.conf file is an existing directory, + # for example /java/linux/cups + if test -d ${resource}; then + depdir=${resource} + else + BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir) + fi + # Source the builddeps file again, because in the previous command, the depdir + # was updated to point at the current build dependency install directory. + . $builddepsfile + # Now extract variables from the builddeps.conf files. + theroot=${builddep_$2_ROOT} + thecflags=${builddep_$2_CFLAGS} + thelibs=${builddep_$2_LIBS} + if test "x$depdir" = x; then + AC_MSG_ERROR([Could not download build dependency $2]) + fi + $1=$depdir + if test "x$theroot" != x; then + $1="$theroot" + fi + if test "x$thecflags" != x; then + $1_CFLAGS="$thecflags" + fi + if test "x$thelibs" != x; then + $1_LIBS="$thelibs" + fi + m4_default([$4], [:]) + m4_ifvaln([$5], [else $5]) + fi + m4_ifvaln([$5], [else $5]) + fi ]) AC_DEFUN([BDEPS_FETCH], [ -# $1 is for example mymodule -# $2 is for example libs/general/libmymod_1_2_3.zip -# $3 is for example ftp://mybuilddeps.myserver.com/builddeps -# $4 is for example /localhome/builddeps -# $5 is the name of the variable into which we store the depdir, eg MYMOD -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3 - filename=`basename $2` - filebase=`echo $filename | sed 's/\.[[^\.]]*$//'` - filebase=${filename%%.*} - extension=${filename#*.} - installdir=$4/$filebase - if test ! -f $installdir/$filename.unpacked; then - AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir]) - if test ! -d $installdir; then - mkdir -p $installdir - fi - if test ! -d $installdir; then - AC_MSG_ERROR([Could not create directory $installdir]) - fi - tmpfile=`mktemp $installdir/$1.XXXXXXXXX` - touch $tmpfile - if test ! -f $tmpfile; then - AC_MSG_ERROR([Could not create files in directory $installdir]) - fi - BDEPS_FTPGET([$3/$2] , [$tmpfile]) - mv $tmpfile $installdir/$filename - if test ! -s $installdir/$filename; then - AC_MSG_ERROR([Could not download $3/$2]) - fi - case "$extension" in - zip) echo "Unzipping $installdir/$filename..." - (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked) - ;; - tar.gz) echo "Untaring $installdir/$filename..." - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) - ;; - tgz) echo "Untaring $installdir/$filename..." - (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) - ;; - *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension]) - ;; - esac + # $1 is for example mymodule + # $2 is for example libs/general/libmymod_1_2_3.zip + # $3 is for example ftp://mybuilddeps.myserver.com/builddeps + # $4 is for example /localhome/builddeps + # $5 is the name of the variable into which we store the depdir, eg MYMOD + # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and + # unzip into the directory: /localhome/builddeps/libmymod_1_2_3 + filename=`basename $2` + filebase=`echo $filename | sed 's/\.[[^\.]]*$//'` + filebase=${filename%%.*} + extension=${filename#*.} + installdir=$4/$filebase + if test ! -f $installdir/$filename.unpacked; then + AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir]) + if test ! -d $installdir; then + mkdir -p $installdir + fi + if test ! -d $installdir; then + AC_MSG_ERROR([Could not create directory $installdir]) fi - if test -f $installdir/$filename.unpacked; then - $5=$installdir + tmpfile=`mktemp $installdir/$1.XXXXXXXXX` + touch $tmpfile + if test ! -f $tmpfile; then + AC_MSG_ERROR([Could not create files in directory $installdir]) + fi + BDEPS_FTPGET([$3/$2] , [$tmpfile]) + mv $tmpfile $installdir/$filename + if test ! -s $installdir/$filename; then + AC_MSG_ERROR([Could not download $3/$2]) fi + case "$extension" in + zip) echo "Unzipping $installdir/$filename..." + (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked) + ;; + tar.gz) echo "Untaring $installdir/$filename..." + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) + ;; + tgz) echo "Untaring $installdir/$filename..." + (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) + ;; + *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension]) + ;; + esac + fi + if test -f $installdir/$filename.unpacked; then + $5=$installdir + fi ]) AC_DEFUN_ONCE([BDEPS_CONFIGURE_BUILDDEPS], [ -AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf], - [use this configuration file for the builddeps])]) +