equal
deleted
inserted
replaced
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 |
618 |
614 BASIC_PATH_PROGS(PANDOC, pandoc) |
619 BASIC_PATH_PROGS(PANDOC, pandoc) |
616 ENABLE_PANDOC="true" |
621 ENABLE_PANDOC="true" |
617 else |
622 else |
618 ENABLE_PANDOC="false" |
623 ENABLE_PANDOC="false" |
619 fi |
624 fi |
620 AC_SUBST(ENABLE_PANDOC) |
625 AC_SUBST(ENABLE_PANDOC) |
|
626 |
|
627 BASIC_PATH_PROGS(LSB_RELEASE, lsb_release) |
|
628 BASIC_PATH_PROGS(CMD, [cmd.exe /mnt/c/Windows/System32/cmd.exe]) |
621 ]) |
629 ]) |
622 |
630 |
623 ############################################################################### |
631 ############################################################################### |
624 # Setup basic configuration paths, and platform-specific stuff related to PATHs. |
632 # Setup basic configuration paths, and platform-specific stuff related to PATHs. |
625 AC_DEFUN_ONCE([BASIC_SETUP_PATHS], |
633 AC_DEFUN_ONCE([BASIC_SETUP_PATHS], |
636 AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH]) |
644 AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH]) |
637 fi |
645 fi |
638 |
646 |
639 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
647 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
640 PATH_SEP=";" |
648 PATH_SEP=";" |
|
649 EXE_SUFFIX=".exe" |
641 BASIC_CHECK_PATHS_WINDOWS |
650 BASIC_CHECK_PATHS_WINDOWS |
642 else |
651 else |
643 PATH_SEP=":" |
652 PATH_SEP=":" |
|
653 EXE_SUFFIX="" |
644 fi |
654 fi |
645 AC_SUBST(PATH_SEP) |
655 AC_SUBST(PATH_SEP) |
|
656 AC_SUBST(EXE_SUFFIX) |
646 |
657 |
647 # We get the top-level directory from the supporting wrappers. |
658 # We get the top-level directory from the supporting wrappers. |
648 AC_MSG_CHECKING([for top-level directory]) |
659 AC_MSG_CHECKING([for top-level directory]) |
649 AC_MSG_RESULT([$TOPDIR]) |
660 AC_MSG_RESULT([$TOPDIR]) |
650 AC_SUBST(TOPDIR) |
661 AC_SUBST(TOPDIR) |
985 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
996 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
986 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
997 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
987 MAKE_EXPECTED_ENV='cygwin' |
998 MAKE_EXPECTED_ENV='cygwin' |
988 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
999 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
989 MAKE_EXPECTED_ENV='msys' |
1000 MAKE_EXPECTED_ENV='msys' |
|
1001 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
|
1002 MAKE_EXPECTED_ENV='x86_64-pc-linux-gnu' |
990 else |
1003 else |
991 AC_MSG_ERROR([Unknown Windows environment]) |
1004 AC_MSG_ERROR([Unknown Windows environment]) |
992 fi |
1005 fi |
993 MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'` |
1006 MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'` |
994 IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV` |
1007 IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV` |
1272 DF_LOCAL_ONLY_OPTION='-l' |
1285 DF_LOCAL_ONLY_OPTION='-l' |
1273 fi |
1286 fi |
1274 if $DF $DF_LOCAL_ONLY_OPTION $1 > /dev/null 2>&1; then |
1287 if $DF $DF_LOCAL_ONLY_OPTION $1 > /dev/null 2>&1; then |
1275 $2 |
1288 $2 |
1276 else |
1289 else |
1277 $3 |
1290 # In WSL, local Windows drives are considered remote by df, but we are |
|
1291 # required to build into a directory accessible from windows, so consider |
|
1292 # them local here. |
|
1293 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
|
1294 if $DF $1 | $GREP -q "^[[A-Z]]:"; then |
|
1295 $2 |
|
1296 else |
|
1297 $3 |
|
1298 fi |
|
1299 else |
|
1300 $3 |
|
1301 fi |
1278 fi |
1302 fi |
1279 fi |
1303 fi |
1280 ]) |
1304 ]) |
1281 |
1305 |
1282 ############################################################################### |
1306 ############################################################################### |