1.1 --- a/common/autoconf/generated-configure.sh Wed Apr 11 09:36:13 2018 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Thu Apr 12 02:54:38 2018 -0700
1.3 @@ -887,8 +887,8 @@
1.4 BUILD_LOG_PREVIOUS
1.5 BUILD_LOG
1.6 SYS_ROOT
1.7 +TOPDIR
1.8 PATH_SEP
1.9 -TOPDIR
1.10 ZERO_ARCHDEF
1.11 DEFINE_CROSS_COMPILE_ARCH
1.12 LP64
1.13 @@ -4225,7 +4225,7 @@
1.14 #CUSTOM_AUTOCONF_INCLUDE
1.15
1.16 # Do not change or remove the following line, it is needed for consistency checks:
1.17 -DATE_WHEN_GENERATED=1523447858
1.18 +DATE_WHEN_GENERATED=1523526861
1.19
1.20 ###############################################################################
1.21 #
1.22 @@ -13899,266 +13899,9 @@
1.23
1.24 # Continue setting up basic stuff. Most remaining code require fundamental tools.
1.25
1.26 - # We get the top-level directory from the supporting wrappers.
1.27 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for top-level directory" >&5
1.28 -$as_echo_n "checking for top-level directory... " >&6; }
1.29 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOPDIR" >&5
1.30 -$as_echo "$TOPDIR" >&6; }
1.31 -
1.32 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.33 -
1.34 - # Input might be given as Windows format, start by converting to
1.35 - # unix format.
1.36 - path="$TOPDIR"
1.37 - new_path=`$CYGPATH -u "$path"`
1.38 -
1.39 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.40 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.41 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.42 - # "foo.exe" is OK but "foo" is an error.
1.43 - #
1.44 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.45 - # It is also a way to make sure we got the proper file name for the real test later on.
1.46 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.47 - if test "x$test_shortpath" = x; then
1.48 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of TOPDIR, which resolves as \"$path\", is invalid." >&5
1.49 -$as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid." >&6;}
1.50 - as_fn_error $? "Cannot locate the the path of TOPDIR" "$LINENO" 5
1.51 - fi
1.52 -
1.53 - # Call helper function which possibly converts this using DOS-style short mode.
1.54 - # If so, the updated path is stored in $new_path.
1.55 -
1.56 - input_path="$new_path"
1.57 - # Check if we need to convert this using DOS-style short mode. If the path
1.58 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.59 - # take no chances and rewrite it.
1.60 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.61 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.62 - if test "x$has_forbidden_chars" != x; then
1.63 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.64 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.65 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.66 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.67 - # Going to short mode and back again did indeed matter. Since short mode is
1.68 - # case insensitive, let's make it lowercase to improve readability.
1.69 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.70 - # Now convert it back to Unix-stile (cygpath)
1.71 - input_path=`$CYGPATH -u "$shortmode_path"`
1.72 - new_path="$input_path"
1.73 - fi
1.74 - fi
1.75 -
1.76 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.77 - if test "x$test_cygdrive_prefix" = x; then
1.78 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.79 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.80 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.81 - # a path prefixed by /cygdrive for fixpath to work.
1.82 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.83 - fi
1.84 - fi
1.85 -
1.86 -
1.87 - if test "x$path" != "x$new_path"; then
1.88 - TOPDIR="$new_path"
1.89 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting TOPDIR to \"$new_path\"" >&5
1.90 -$as_echo "$as_me: Rewriting TOPDIR to \"$new_path\"" >&6;}
1.91 - fi
1.92 -
1.93 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.94 -
1.95 - path="$TOPDIR"
1.96 - has_colon=`$ECHO $path | $GREP ^.:`
1.97 - new_path="$path"
1.98 - if test "x$has_colon" = x; then
1.99 - # Not in mixed or Windows style, start by that.
1.100 - new_path=`cmd //c echo $path`
1.101 - fi
1.102 -
1.103 -
1.104 - input_path="$new_path"
1.105 - # Check if we need to convert this using DOS-style short mode. If the path
1.106 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.107 - # take no chances and rewrite it.
1.108 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.109 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.110 - if test "x$has_forbidden_chars" != x; then
1.111 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.112 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.113 - fi
1.114 -
1.115 -
1.116 - windows_path="$new_path"
1.117 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.118 - unix_path=`$CYGPATH -u "$windows_path"`
1.119 - new_path="$unix_path"
1.120 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.121 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.122 - new_path="$unix_path"
1.123 - fi
1.124 -
1.125 - if test "x$path" != "x$new_path"; then
1.126 - TOPDIR="$new_path"
1.127 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting TOPDIR to \"$new_path\"" >&5
1.128 -$as_echo "$as_me: Rewriting TOPDIR to \"$new_path\"" >&6;}
1.129 - fi
1.130 -
1.131 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.132 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.133 -
1.134 - else
1.135 - # We're on a posix platform. Hooray! :)
1.136 - path="$TOPDIR"
1.137 - has_space=`$ECHO "$path" | $GREP " "`
1.138 - if test "x$has_space" != x; then
1.139 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of TOPDIR, which resolves as \"$path\", is invalid." >&5
1.140 -$as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid." >&6;}
1.141 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.142 - fi
1.143 -
1.144 - # Use eval to expand a potential ~
1.145 - eval path="$path"
1.146 - if test ! -f "$path" && test ! -d "$path"; then
1.147 - as_fn_error $? "The path of TOPDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.148 - fi
1.149 -
1.150 - TOPDIR="`cd "$path"; $THEPWDCMD -L`"
1.151 - fi
1.152 -
1.153 -
1.154 -
1.155 - # SRC_ROOT is a traditional alias for TOPDIR.
1.156 - SRC_ROOT=$TOPDIR
1.157 -
1.158 - # Locate the directory of this script.
1.159 - AUTOCONF_DIR=$TOPDIR/common/autoconf
1.160 -
1.161 # Save the current directory this script was started from
1.162 CURDIR="$PWD"
1.163
1.164 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.165 -
1.166 - # Input might be given as Windows format, start by converting to
1.167 - # unix format.
1.168 - path="$CURDIR"
1.169 - new_path=`$CYGPATH -u "$path"`
1.170 -
1.171 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.172 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.173 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.174 - # "foo.exe" is OK but "foo" is an error.
1.175 - #
1.176 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.177 - # It is also a way to make sure we got the proper file name for the real test later on.
1.178 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.179 - if test "x$test_shortpath" = x; then
1.180 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
1.181 -$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
1.182 - as_fn_error $? "Cannot locate the the path of CURDIR" "$LINENO" 5
1.183 - fi
1.184 -
1.185 - # Call helper function which possibly converts this using DOS-style short mode.
1.186 - # If so, the updated path is stored in $new_path.
1.187 -
1.188 - input_path="$new_path"
1.189 - # Check if we need to convert this using DOS-style short mode. If the path
1.190 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.191 - # take no chances and rewrite it.
1.192 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.193 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.194 - if test "x$has_forbidden_chars" != x; then
1.195 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.196 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.197 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.198 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.199 - # Going to short mode and back again did indeed matter. Since short mode is
1.200 - # case insensitive, let's make it lowercase to improve readability.
1.201 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.202 - # Now convert it back to Unix-stile (cygpath)
1.203 - input_path=`$CYGPATH -u "$shortmode_path"`
1.204 - new_path="$input_path"
1.205 - fi
1.206 - fi
1.207 -
1.208 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.209 - if test "x$test_cygdrive_prefix" = x; then
1.210 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.211 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.212 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.213 - # a path prefixed by /cygdrive for fixpath to work.
1.214 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.215 - fi
1.216 - fi
1.217 -
1.218 -
1.219 - if test "x$path" != "x$new_path"; then
1.220 - CURDIR="$new_path"
1.221 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
1.222 -$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
1.223 - fi
1.224 -
1.225 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.226 -
1.227 - path="$CURDIR"
1.228 - has_colon=`$ECHO $path | $GREP ^.:`
1.229 - new_path="$path"
1.230 - if test "x$has_colon" = x; then
1.231 - # Not in mixed or Windows style, start by that.
1.232 - new_path=`cmd //c echo $path`
1.233 - fi
1.234 -
1.235 -
1.236 - input_path="$new_path"
1.237 - # Check if we need to convert this using DOS-style short mode. If the path
1.238 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.239 - # take no chances and rewrite it.
1.240 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.241 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.242 - if test "x$has_forbidden_chars" != x; then
1.243 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.244 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.245 - fi
1.246 -
1.247 -
1.248 - windows_path="$new_path"
1.249 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.250 - unix_path=`$CYGPATH -u "$windows_path"`
1.251 - new_path="$unix_path"
1.252 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.253 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.254 - new_path="$unix_path"
1.255 - fi
1.256 -
1.257 - if test "x$path" != "x$new_path"; then
1.258 - CURDIR="$new_path"
1.259 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
1.260 -$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
1.261 - fi
1.262 -
1.263 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.264 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.265 -
1.266 - else
1.267 - # We're on a posix platform. Hooray! :)
1.268 - path="$CURDIR"
1.269 - has_space=`$ECHO "$path" | $GREP " "`
1.270 - if test "x$has_space" != x; then
1.271 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
1.272 -$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
1.273 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.274 - fi
1.275 -
1.276 - # Use eval to expand a potential ~
1.277 - eval path="$path"
1.278 - if test ! -f "$path" && test ! -d "$path"; then
1.279 - as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.280 - fi
1.281 -
1.282 - CURDIR="`cd "$path"; $THEPWDCMD -L`"
1.283 - fi
1.284 -
1.285 -
1.286 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.287 PATH_SEP=";"
1.288
1.289 @@ -14256,6 +13999,264 @@
1.290 fi
1.291
1.292
1.293 + # We get the top-level directory from the supporting wrappers.
1.294 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for top-level directory" >&5
1.295 +$as_echo_n "checking for top-level directory... " >&6; }
1.296 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOPDIR" >&5
1.297 +$as_echo "$TOPDIR" >&6; }
1.298 +
1.299 +
1.300 + # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
1.301 +
1.302 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.303 +
1.304 + # Input might be given as Windows format, start by converting to
1.305 + # unix format.
1.306 + path="$CURDIR"
1.307 + new_path=`$CYGPATH -u "$path"`
1.308 +
1.309 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.310 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.311 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.312 + # "foo.exe" is OK but "foo" is an error.
1.313 + #
1.314 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.315 + # It is also a way to make sure we got the proper file name for the real test later on.
1.316 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.317 + if test "x$test_shortpath" = x; then
1.318 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
1.319 +$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
1.320 + as_fn_error $? "Cannot locate the the path of CURDIR" "$LINENO" 5
1.321 + fi
1.322 +
1.323 + # Call helper function which possibly converts this using DOS-style short mode.
1.324 + # If so, the updated path is stored in $new_path.
1.325 +
1.326 + input_path="$new_path"
1.327 + # Check if we need to convert this using DOS-style short mode. If the path
1.328 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.329 + # take no chances and rewrite it.
1.330 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.331 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.332 + if test "x$has_forbidden_chars" != x; then
1.333 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.334 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.335 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.336 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.337 + # Going to short mode and back again did indeed matter. Since short mode is
1.338 + # case insensitive, let's make it lowercase to improve readability.
1.339 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.340 + # Now convert it back to Unix-stile (cygpath)
1.341 + input_path=`$CYGPATH -u "$shortmode_path"`
1.342 + new_path="$input_path"
1.343 + fi
1.344 + fi
1.345 +
1.346 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.347 + if test "x$test_cygdrive_prefix" = x; then
1.348 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.349 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.350 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.351 + # a path prefixed by /cygdrive for fixpath to work.
1.352 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.353 + fi
1.354 + fi
1.355 +
1.356 +
1.357 + if test "x$path" != "x$new_path"; then
1.358 + CURDIR="$new_path"
1.359 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
1.360 +$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
1.361 + fi
1.362 +
1.363 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.364 +
1.365 + path="$CURDIR"
1.366 + has_colon=`$ECHO $path | $GREP ^.:`
1.367 + new_path="$path"
1.368 + if test "x$has_colon" = x; then
1.369 + # Not in mixed or Windows style, start by that.
1.370 + new_path=`cmd //c echo $path`
1.371 + fi
1.372 +
1.373 +
1.374 + input_path="$new_path"
1.375 + # Check if we need to convert this using DOS-style short mode. If the path
1.376 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.377 + # take no chances and rewrite it.
1.378 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.379 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.380 + if test "x$has_forbidden_chars" != x; then
1.381 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.382 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.383 + fi
1.384 +
1.385 +
1.386 + windows_path="$new_path"
1.387 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.388 + unix_path=`$CYGPATH -u "$windows_path"`
1.389 + new_path="$unix_path"
1.390 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.391 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.392 + new_path="$unix_path"
1.393 + fi
1.394 +
1.395 + if test "x$path" != "x$new_path"; then
1.396 + CURDIR="$new_path"
1.397 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CURDIR to \"$new_path\"" >&5
1.398 +$as_echo "$as_me: Rewriting CURDIR to \"$new_path\"" >&6;}
1.399 + fi
1.400 +
1.401 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.402 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.403 +
1.404 + else
1.405 + # We're on a posix platform. Hooray! :)
1.406 + path="$CURDIR"
1.407 + has_space=`$ECHO "$path" | $GREP " "`
1.408 + if test "x$has_space" != x; then
1.409 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5
1.410 +$as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;}
1.411 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.412 + fi
1.413 +
1.414 + # Use eval to expand a potential ~
1.415 + eval path="$path"
1.416 + if test ! -f "$path" && test ! -d "$path"; then
1.417 + as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.418 + fi
1.419 +
1.420 + CURDIR="`cd "$path"; $THEPWDCMD -L`"
1.421 + fi
1.422 +
1.423 +
1.424 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.425 +
1.426 + # Input might be given as Windows format, start by converting to
1.427 + # unix format.
1.428 + path="$TOPDIR"
1.429 + new_path=`$CYGPATH -u "$path"`
1.430 +
1.431 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.432 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.433 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.434 + # "foo.exe" is OK but "foo" is an error.
1.435 + #
1.436 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.437 + # It is also a way to make sure we got the proper file name for the real test later on.
1.438 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.439 + if test "x$test_shortpath" = x; then
1.440 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of TOPDIR, which resolves as \"$path\", is invalid." >&5
1.441 +$as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid." >&6;}
1.442 + as_fn_error $? "Cannot locate the the path of TOPDIR" "$LINENO" 5
1.443 + fi
1.444 +
1.445 + # Call helper function which possibly converts this using DOS-style short mode.
1.446 + # If so, the updated path is stored in $new_path.
1.447 +
1.448 + input_path="$new_path"
1.449 + # Check if we need to convert this using DOS-style short mode. If the path
1.450 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.451 + # take no chances and rewrite it.
1.452 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.453 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.454 + if test "x$has_forbidden_chars" != x; then
1.455 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.456 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.457 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.458 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.459 + # Going to short mode and back again did indeed matter. Since short mode is
1.460 + # case insensitive, let's make it lowercase to improve readability.
1.461 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.462 + # Now convert it back to Unix-stile (cygpath)
1.463 + input_path=`$CYGPATH -u "$shortmode_path"`
1.464 + new_path="$input_path"
1.465 + fi
1.466 + fi
1.467 +
1.468 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.469 + if test "x$test_cygdrive_prefix" = x; then
1.470 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.471 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.472 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.473 + # a path prefixed by /cygdrive for fixpath to work.
1.474 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.475 + fi
1.476 + fi
1.477 +
1.478 +
1.479 + if test "x$path" != "x$new_path"; then
1.480 + TOPDIR="$new_path"
1.481 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting TOPDIR to \"$new_path\"" >&5
1.482 +$as_echo "$as_me: Rewriting TOPDIR to \"$new_path\"" >&6;}
1.483 + fi
1.484 +
1.485 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.486 +
1.487 + path="$TOPDIR"
1.488 + has_colon=`$ECHO $path | $GREP ^.:`
1.489 + new_path="$path"
1.490 + if test "x$has_colon" = x; then
1.491 + # Not in mixed or Windows style, start by that.
1.492 + new_path=`cmd //c echo $path`
1.493 + fi
1.494 +
1.495 +
1.496 + input_path="$new_path"
1.497 + # Check if we need to convert this using DOS-style short mode. If the path
1.498 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.499 + # take no chances and rewrite it.
1.500 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.501 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.502 + if test "x$has_forbidden_chars" != x; then
1.503 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.504 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.505 + fi
1.506 +
1.507 +
1.508 + windows_path="$new_path"
1.509 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.510 + unix_path=`$CYGPATH -u "$windows_path"`
1.511 + new_path="$unix_path"
1.512 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.513 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.514 + new_path="$unix_path"
1.515 + fi
1.516 +
1.517 + if test "x$path" != "x$new_path"; then
1.518 + TOPDIR="$new_path"
1.519 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting TOPDIR to \"$new_path\"" >&5
1.520 +$as_echo "$as_me: Rewriting TOPDIR to \"$new_path\"" >&6;}
1.521 + fi
1.522 +
1.523 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.524 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.525 +
1.526 + else
1.527 + # We're on a posix platform. Hooray! :)
1.528 + path="$TOPDIR"
1.529 + has_space=`$ECHO "$path" | $GREP " "`
1.530 + if test "x$has_space" != x; then
1.531 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of TOPDIR, which resolves as \"$path\", is invalid." >&5
1.532 +$as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid." >&6;}
1.533 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.534 + fi
1.535 +
1.536 + # Use eval to expand a potential ~
1.537 + eval path="$path"
1.538 + if test ! -f "$path" && test ! -d "$path"; then
1.539 + as_fn_error $? "The path of TOPDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.540 + fi
1.541 +
1.542 + TOPDIR="`cd "$path"; $THEPWDCMD -L`"
1.543 + fi
1.544 +
1.545 + # SRC_ROOT is a traditional alias for TOPDIR.
1.546 + SRC_ROOT=$TOPDIR
1.547 +
1.548 + # Locate the directory of this script.
1.549 + AUTOCONF_DIR=$TOPDIR/common/autoconf
1.550 +
1.551 if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
1.552 # Add extra search paths on solaris for utilities like ar and as etc...
1.553 PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
