equal
deleted
inserted
replaced
75 else |
75 else |
76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
77 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $HEAD -n 1` |
77 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $HEAD -n 1` |
78 |
78 |
79 # Extra M4 quote needed to protect [] in grep expression. |
79 # Extra M4 quote needed to protect [] in grep expression. |
80 [FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"10([\.+-].*)?\"|\"9([\.+-].*)?\"'`] |
80 [FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION \ |
|
81 | $EGREP "\"(${DEFAULT_ACCEPTABLE_BOOT_VERSIONS// /|})([\.+-].*)?\""`] |
81 if test "x$FOUND_CORRECT_VERSION" = x; then |
82 if test "x$FOUND_CORRECT_VERSION" = x; then |
82 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring]) |
83 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring]) |
83 AC_MSG_NOTICE([(Your Boot JDK must be version 9 or 10)]) |
84 AC_MSG_NOTICE([(Your Boot JDK version must be one of: $DEFAULT_ACCEPTABLE_BOOT_VERSIONS)]) |
84 BOOT_JDK_FOUND=no |
85 BOOT_JDK_FOUND=no |
85 else |
86 else |
86 # We're done! :-) |
87 # We're done! :-) |
87 BOOT_JDK_FOUND=yes |
88 BOOT_JDK_FOUND=yes |
88 BASIC_FIXUP_PATH(BOOT_JDK) |
89 BASIC_FIXUP_PATH(BOOT_JDK) |
508 else |
509 else |
509 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
510 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
510 BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $HEAD -n 1` |
511 BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $HEAD -n 1` |
511 |
512 |
512 # Extra M4 quote needed to protect [] in grep expression. |
513 # Extra M4 quote needed to protect [] in grep expression. |
513 [FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP '\"10([\.+-].*)?\"'`] |
514 [FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP "\"$VERSION_FEATURE([\.+-].*)?\""`] |
514 if test "x$FOUND_CORRECT_VERSION" = x; then |
515 if test "x$FOUND_CORRECT_VERSION" = x; then |
515 AC_MSG_NOTICE([Potential Build JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring]) |
516 AC_MSG_NOTICE([Potential Build JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring]) |
516 AC_MSG_NOTICE([(Your Build JDK must be version 10)]) |
517 AC_MSG_NOTICE([(Your Build JDK must be version $VERSION_FEATURE)]) |
517 BUILD_JDK_FOUND=no |
518 BUILD_JDK_FOUND=no |
518 else |
519 else |
519 # We're done! |
520 # We're done! |
520 BUILD_JDK_FOUND=yes |
521 BUILD_JDK_FOUND=yes |
521 BASIC_FIXUP_PATH(BUILD_JDK) |
522 BASIC_FIXUP_PATH(BUILD_JDK) |