221 if test "x[$]$1" != x; then |
221 if test "x[$]$1" != x; then |
222 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
222 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
223 BASIC_FIXUP_PATH_CYGWIN($1) |
223 BASIC_FIXUP_PATH_CYGWIN($1) |
224 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
224 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
225 BASIC_FIXUP_PATH_MSYS($1) |
225 BASIC_FIXUP_PATH_MSYS($1) |
|
226 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
|
227 BASIC_FIXUP_PATH_WSL($1) |
226 else |
228 else |
227 # We're on a unix platform. Hooray! :) |
229 # We're on a unix platform. Hooray! :) |
228 path="[$]$1" |
230 path="[$]$1" |
229 has_space=`$ECHO "$path" | $GREP " "` |
231 has_space=`$ECHO "$path" | $GREP " "` |
230 if test "x$has_space" != x; then |
232 if test "x$has_space" != x; then |
268 if test "x[$]$1" != x; then |
270 if test "x[$]$1" != x; then |
269 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
271 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
270 BASIC_FIXUP_EXECUTABLE_CYGWIN($1) |
272 BASIC_FIXUP_EXECUTABLE_CYGWIN($1) |
271 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
273 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
272 BASIC_FIXUP_EXECUTABLE_MSYS($1) |
274 BASIC_FIXUP_EXECUTABLE_MSYS($1) |
|
275 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
|
276 BASIC_FIXUP_EXECUTABLE_WSL($1) |
273 else |
277 else |
274 # We're on a unix platform. Hooray! :) |
278 # We're on a unix platform. Hooray! :) |
275 # First separate the path from the arguments. This will split at the first |
279 # First separate the path from the arguments. This will split at the first |
276 # space. |
280 # space. |
277 complete="[$]$1" |
281 complete="[$]$1" |
605 # Always use the bash builtin pwd to get uniform behavior. |
609 # Always use the bash builtin pwd to get uniform behavior. |
606 THEPWDCMD=pwd |
610 THEPWDCMD=pwd |
607 |
611 |
608 # These are not required on all platforms |
612 # These are not required on all platforms |
609 BASIC_PATH_PROGS(CYGPATH, cygpath) |
613 BASIC_PATH_PROGS(CYGPATH, cygpath) |
|
614 BASIC_PATH_PROGS(WSLPATH, wslpath) |
610 BASIC_PATH_PROGS(DF, df) |
615 BASIC_PATH_PROGS(DF, df) |
611 BASIC_PATH_PROGS(CPIO, [cpio bsdcpio]) |
616 BASIC_PATH_PROGS(CPIO, [cpio bsdcpio]) |
612 BASIC_PATH_PROGS(NICE, nice) |
617 BASIC_PATH_PROGS(NICE, nice) |
613 BASIC_PATH_PROGS(PANDOC, pandoc) |
618 BASIC_PATH_PROGS(PANDOC, pandoc) |
|
619 |
|
620 BASIC_PATH_PROGS(CMD, [cmd.exe /mnt/c/Windows/System32/cmd.exe]) |
614 ]) |
621 ]) |
615 |
622 |
616 ############################################################################### |
623 ############################################################################### |
617 # Setup basic configuration paths, and platform-specific stuff related to PATHs. |
624 # Setup basic configuration paths, and platform-specific stuff related to PATHs. |
618 AC_DEFUN_ONCE([BASIC_SETUP_PATHS], |
625 AC_DEFUN_ONCE([BASIC_SETUP_PATHS], |
632 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
639 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
633 PATH_SEP=";" |
640 PATH_SEP=";" |
634 BASIC_CHECK_PATHS_WINDOWS |
641 BASIC_CHECK_PATHS_WINDOWS |
635 else |
642 else |
636 PATH_SEP=":" |
643 PATH_SEP=":" |
|
644 EXECUTABLE_SUFFIX="" |
637 fi |
645 fi |
638 AC_SUBST(PATH_SEP) |
646 AC_SUBST(PATH_SEP) |
|
647 AC_SUBST(EXECUTABLE_SUFFIX) |
639 |
648 |
640 # We get the top-level directory from the supporting wrappers. |
649 # We get the top-level directory from the supporting wrappers. |
641 AC_MSG_CHECKING([for top-level directory]) |
650 AC_MSG_CHECKING([for top-level directory]) |
642 AC_MSG_RESULT([$TOPDIR]) |
651 AC_MSG_RESULT([$TOPDIR]) |
643 AC_SUBST(TOPDIR) |
652 AC_SUBST(TOPDIR) |
978 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
987 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
979 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
988 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
980 MAKE_EXPECTED_ENV='cygwin' |
989 MAKE_EXPECTED_ENV='cygwin' |
981 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
990 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
982 MAKE_EXPECTED_ENV='msys' |
991 MAKE_EXPECTED_ENV='msys' |
|
992 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
|
993 MAKE_EXPECTED_ENV='x86_64-pc-linux-gnu' |
983 else |
994 else |
984 AC_MSG_ERROR([Unknown Windows environment]) |
995 AC_MSG_ERROR([Unknown Windows environment]) |
985 fi |
996 fi |
986 MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'` |
997 MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'` |
987 IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV` |
998 IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV` |