1.1 --- a/common/autoconf/generated-configure.sh Mon Jul 01 15:40:27 2013 +0200
1.2 +++ b/common/autoconf/generated-configure.sh Tue Jul 02 15:07:05 2013 +0200
1.3 @@ -3786,7 +3786,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1372685988
1.8 +DATE_WHEN_GENERATED=1372770384
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -7462,128 +7462,6 @@
1.13 if test "${with_tools_dir+set}" = set; then :
1.14 withval=$with_tools_dir; TOOLS_DIR=$with_tools_dir
1.15
1.16 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.17 -
1.18 - # Input might be given as Windows format, start by converting to
1.19 - # unix format.
1.20 - path="$TOOLS_DIR"
1.21 - new_path=`$CYGPATH -u "$path"`
1.22 -
1.23 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.24 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.25 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.26 - # "foo.exe" is OK but "foo" is an error.
1.27 - #
1.28 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.29 - # It is also a way to make sure we got the proper file name for the real test later on.
1.30 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.31 - if test "x$test_shortpath" = x; then
1.32 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of TOOLS_DIR, which resolves as \"$path\", is invalid." >&5
1.33 -$as_echo "$as_me: The path of TOOLS_DIR, which resolves as \"$path\", is invalid." >&6;}
1.34 - as_fn_error $? "Cannot locate the the path of TOOLS_DIR" "$LINENO" 5
1.35 - fi
1.36 -
1.37 - # Call helper function which possibly converts this using DOS-style short mode.
1.38 - # If so, the updated path is stored in $new_path.
1.39 -
1.40 - input_path="$new_path"
1.41 - # Check if we need to convert this using DOS-style short mode. If the path
1.42 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.43 - # take no chances and rewrite it.
1.44 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.45 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.46 - if test "x$has_forbidden_chars" != x; then
1.47 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.48 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.49 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.50 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.51 - # Going to short mode and back again did indeed matter. Since short mode is
1.52 - # case insensitive, let's make it lowercase to improve readability.
1.53 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.54 - # Now convert it back to Unix-stile (cygpath)
1.55 - input_path=`$CYGPATH -u "$shortmode_path"`
1.56 - new_path="$input_path"
1.57 - fi
1.58 - fi
1.59 -
1.60 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.61 - if test "x$test_cygdrive_prefix" = x; then
1.62 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.63 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.64 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.65 - # a path prefixed by /cygdrive for fixpath to work.
1.66 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.67 - fi
1.68 - fi
1.69 -
1.70 -
1.71 - if test "x$path" != "x$new_path"; then
1.72 - TOOLS_DIR="$new_path"
1.73 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting TOOLS_DIR to \"$new_path\"" >&5
1.74 -$as_echo "$as_me: Rewriting TOOLS_DIR to \"$new_path\"" >&6;}
1.75 - fi
1.76 -
1.77 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.78 -
1.79 - path="$TOOLS_DIR"
1.80 - has_colon=`$ECHO $path | $GREP ^.:`
1.81 - new_path="$path"
1.82 - if test "x$has_colon" = x; then
1.83 - # Not in mixed or Windows style, start by that.
1.84 - new_path=`cmd //c echo $path`
1.85 - fi
1.86 -
1.87 -
1.88 - input_path="$new_path"
1.89 - # Check if we need to convert this using DOS-style short mode. If the path
1.90 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.91 - # take no chances and rewrite it.
1.92 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.93 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.94 - if test "x$has_forbidden_chars" != x; then
1.95 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.96 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.97 - fi
1.98 -
1.99 -
1.100 - windows_path="$new_path"
1.101 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.102 - unix_path=`$CYGPATH -u "$windows_path"`
1.103 - new_path="$unix_path"
1.104 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.105 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.106 - new_path="$unix_path"
1.107 - fi
1.108 -
1.109 - if test "x$path" != "x$new_path"; then
1.110 - TOOLS_DIR="$new_path"
1.111 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting TOOLS_DIR to \"$new_path\"" >&5
1.112 -$as_echo "$as_me: Rewriting TOOLS_DIR to \"$new_path\"" >&6;}
1.113 - fi
1.114 -
1.115 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.116 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.117 -
1.118 - else
1.119 - # We're on a posix platform. Hooray! :)
1.120 - path="$TOOLS_DIR"
1.121 - has_space=`$ECHO "$path" | $GREP " "`
1.122 - if test "x$has_space" != x; then
1.123 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of TOOLS_DIR, which resolves as \"$path\", is invalid." >&5
1.124 -$as_echo "$as_me: The path of TOOLS_DIR, which resolves as \"$path\", is invalid." >&6;}
1.125 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.126 - fi
1.127 -
1.128 - # Use eval to expand a potential ~
1.129 - eval path="$path"
1.130 - if test ! -f "$path" && test ! -d "$path"; then
1.131 - as_fn_error $? "The path of TOOLS_DIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.132 - fi
1.133 -
1.134 - TOOLS_DIR="`cd "$path"; $THEPWDCMD -L`"
1.135 - fi
1.136 -
1.137 -
1.138 fi
1.139
1.140
