1.1 --- a/common/autoconf/generated-configure.sh Wed May 16 15:52:51 2018 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Mon May 21 06:54:25 2018 -0700
1.3 @@ -3404,6 +3404,10 @@
1.4 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
1.5
1.6
1.7 +# Evaluates platform specific overrides for devkit variables.
1.8 +# $1: Name of variable
1.9 +
1.10 +
1.11
1.12
1.13
1.14 @@ -4301,7 +4305,7 @@
1.15 #CUSTOM_AUTOCONF_INCLUDE
1.16
1.17 # Do not change or remove the following line, it is needed for consistency checks:
1.18 -DATE_WHEN_GENERATED=1526507291
1.19 +DATE_WHEN_GENERATED=1526910855
1.20
1.21 ###############################################################################
1.22 #
1.23 @@ -14117,7 +14121,7 @@
1.24 # Going to short mode and back again did indeed matter. Since short mode is
1.25 # case insensitive, let's make it lowercase to improve readability.
1.26 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.27 - # Now convert it back to Unix-stile (cygpath)
1.28 + # Now convert it back to Unix-style (cygpath)
1.29 input_path=`$CYGPATH -u "$shortmode_path"`
1.30 new_path="$input_path"
1.31 fi
1.32 @@ -14239,7 +14243,7 @@
1.33 # Going to short mode and back again did indeed matter. Since short mode is
1.34 # case insensitive, let's make it lowercase to improve readability.
1.35 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.36 - # Now convert it back to Unix-stile (cygpath)
1.37 + # Now convert it back to Unix-style (cygpath)
1.38 input_path=`$CYGPATH -u "$shortmode_path"`
1.39 new_path="$input_path"
1.40 fi
1.41 @@ -14726,7 +14730,7 @@
1.42 # Going to short mode and back again did indeed matter. Since short mode is
1.43 # case insensitive, let's make it lowercase to improve readability.
1.44 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.45 - # Now convert it back to Unix-stile (cygpath)
1.46 + # Now convert it back to Unix-style (cygpath)
1.47 input_path=`$CYGPATH -u "$shortmode_path"`
1.48 new_path="$input_path"
1.49 fi
1.50 @@ -14812,12 +14816,63 @@
1.51 DEVKIT_ROOT="$with_devkit"
1.52 # Check for a meta data info file in the root of the devkit
1.53 if test -f "$DEVKIT_ROOT/devkit.info"; then
1.54 + . $DEVKIT_ROOT/devkit.info
1.55 # This potentially sets the following:
1.56 - # DEVKIT_NAME: A descriptive name of the devkit
1.57 - # DEVKIT_TOOLCHAIN_PATH: Corresponds to --with-toolchain-path
1.58 - # DEVKIT_EXTRA_PATH: Corresponds to --with-extra-path
1.59 - # DEVKIT_SYSROOT: Corresponds to --with-sysroot
1.60 - . $DEVKIT_ROOT/devkit.info
1.61 + # A descriptive name of the devkit
1.62 +
1.63 + if test "x$DEVKIT_NAME" = x; then
1.64 + eval DEVKIT_NAME="\${DEVKIT_NAME_${OPENJDK_TARGET_CPU}}"
1.65 + fi
1.66 +
1.67 + # Corresponds to --with-extra-path
1.68 +
1.69 + if test "x$DEVKIT_EXTRA_PATH" = x; then
1.70 + eval DEVKIT_EXTRA_PATH="\${DEVKIT_EXTRA_PATH_${OPENJDK_TARGET_CPU}}"
1.71 + fi
1.72 +
1.73 + # Corresponds to --with-toolchain-path
1.74 +
1.75 + if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
1.76 + eval DEVKIT_TOOLCHAIN_PATH="\${DEVKIT_TOOLCHAIN_PATH_${OPENJDK_TARGET_CPU}}"
1.77 + fi
1.78 +
1.79 + # Corresponds to --with-sysroot
1.80 +
1.81 + if test "x$DEVKIT_SYSROOT" = x; then
1.82 + eval DEVKIT_SYSROOT="\${DEVKIT_SYSROOT_${OPENJDK_TARGET_CPU}}"
1.83 + fi
1.84 +
1.85 +
1.86 + # Identifies the Visual Studio version in the devkit
1.87 +
1.88 + if test "x$DEVKIT_VS_VERSION" = x; then
1.89 + eval DEVKIT_VS_VERSION="\${DEVKIT_VS_VERSION_${OPENJDK_TARGET_CPU}}"
1.90 + fi
1.91 +
1.92 + # The Visual Studio include environment variable
1.93 +
1.94 + if test "x$DEVKIT_VS_INCLUDE" = x; then
1.95 + eval DEVKIT_VS_INCLUDE="\${DEVKIT_VS_INCLUDE_${OPENJDK_TARGET_CPU}}"
1.96 + fi
1.97 +
1.98 + # The Visual Studio lib environment variable
1.99 +
1.100 + if test "x$DEVKIT_VS_LIB" = x; then
1.101 + eval DEVKIT_VS_LIB="\${DEVKIT_VS_LIB_${OPENJDK_TARGET_CPU}}"
1.102 + fi
1.103 +
1.104 + # Corresponds to --with-msvcr-dll
1.105 +
1.106 + if test "x$DEVKIT_MSVCR_DLL" = x; then
1.107 + eval DEVKIT_MSVCR_DLL="\${DEVKIT_MSVCR_DLL_${OPENJDK_TARGET_CPU}}"
1.108 + fi
1.109 +
1.110 + # Corresponds to --with-msvcp-dll
1.111 +
1.112 + if test "x$DEVKIT_MSVCP_DLL" = x; then
1.113 + eval DEVKIT_MSVCP_DLL="\${DEVKIT_MSVCP_DLL_${OPENJDK_TARGET_CPU}}"
1.114 + fi
1.115 +
1.116 fi
1.117
1.118 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for devkit" >&5
1.119 @@ -14830,7 +14885,6 @@
1.120 $as_echo "$DEVKIT_ROOT" >&6; }
1.121 fi
1.122
1.123 - if test "x$DEVKIT_EXTRA_PATH" != x; then
1.124
1.125 if test "x$DEVKIT_EXTRA_PATH" != x; then
1.126 if test "x$EXTRA_PATH" = x; then
1.127 @@ -14840,7 +14894,6 @@
1.128 fi
1.129 fi
1.130
1.131 - fi
1.132
1.133 # Fallback default of just /bin if DEVKIT_PATH is not defined
1.134 if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
1.135 @@ -15028,8 +15081,12 @@
1.136 files_present=`$LS $OUTPUT_ROOT`
1.137 # Configure has already touched config.log and confdefs.h in the current dir when this check
1.138 # is performed.
1.139 - filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
1.140 - | $TR -d '\n'`
1.141 + filtered_files=`$ECHO "$files_present" \
1.142 + | $SED -e 's/config.log//g' \
1.143 + -e 's/confdefs.h//g' \
1.144 + -e 's/fixpath.exe//g' \
1.145 + -e 's/ //g' \
1.146 + | $TR -d '\n'`
1.147 if test "x$filtered_files" != x; then
1.148 { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
1.149 $as_echo "$as_me: Current directory is $CURDIR." >&6;}
1.150 @@ -15093,7 +15150,7 @@
1.151 # Going to short mode and back again did indeed matter. Since short mode is
1.152 # case insensitive, let's make it lowercase to improve readability.
1.153 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.154 - # Now convert it back to Unix-stile (cygpath)
1.155 + # Now convert it back to Unix-style (cygpath)
1.156 input_path=`$CYGPATH -u "$shortmode_path"`
1.157 new_path="$input_path"
1.158 fi
1.159 @@ -15396,7 +15453,7 @@
1.160 # Going to short mode and back again did indeed matter. Since short mode is
1.161 # case insensitive, let's make it lowercase to improve readability.
1.162 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.163 - # Now convert it back to Unix-stile (cygpath)
1.164 + # Now convert it back to Unix-style (cygpath)
1.165 input_path=`$CYGPATH -u "$shortmode_path"`
1.166 new_path="$input_path"
1.167 fi
1.168 @@ -15769,7 +15826,7 @@
1.169 # Going to short mode and back again did indeed matter. Since short mode is
1.170 # case insensitive, let's make it lowercase to improve readability.
1.171 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.172 - # Now convert it back to Unix-stile (cygpath)
1.173 + # Now convert it back to Unix-style (cygpath)
1.174 input_path=`$CYGPATH -u "$shortmode_path"`
1.175 new_path="$input_path"
1.176 fi
1.177 @@ -16139,7 +16196,7 @@
1.178 # Going to short mode and back again did indeed matter. Since short mode is
1.179 # case insensitive, let's make it lowercase to improve readability.
1.180 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.181 - # Now convert it back to Unix-stile (cygpath)
1.182 + # Now convert it back to Unix-style (cygpath)
1.183 input_path=`$CYGPATH -u "$shortmode_path"`
1.184 new_path="$input_path"
1.185 fi
1.186 @@ -16514,7 +16571,7 @@
1.187 # Going to short mode and back again did indeed matter. Since short mode is
1.188 # case insensitive, let's make it lowercase to improve readability.
1.189 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.190 - # Now convert it back to Unix-stile (cygpath)
1.191 + # Now convert it back to Unix-style (cygpath)
1.192 input_path=`$CYGPATH -u "$shortmode_path"`
1.193 new_path="$input_path"
1.194 fi
1.195 @@ -16883,7 +16940,7 @@
1.196 # Going to short mode and back again did indeed matter. Since short mode is
1.197 # case insensitive, let's make it lowercase to improve readability.
1.198 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.199 - # Now convert it back to Unix-stile (cygpath)
1.200 + # Now convert it back to Unix-style (cygpath)
1.201 input_path=`$CYGPATH -u "$shortmode_path"`
1.202 new_path="$input_path"
1.203 fi
1.204 @@ -19885,7 +19942,7 @@
1.205 # Going to short mode and back again did indeed matter. Since short mode is
1.206 # case insensitive, let's make it lowercase to improve readability.
1.207 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.208 - # Now convert it back to Unix-stile (cygpath)
1.209 + # Now convert it back to Unix-style (cygpath)
1.210 input_path=`$CYGPATH -u "$shortmode_path"`
1.211 new_path="$input_path"
1.212 fi
1.213 @@ -20217,7 +20274,7 @@
1.214 # Going to short mode and back again did indeed matter. Since short mode is
1.215 # case insensitive, let's make it lowercase to improve readability.
1.216 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.217 - # Now convert it back to Unix-stile (cygpath)
1.218 + # Now convert it back to Unix-style (cygpath)
1.219 input_path=`$CYGPATH -u "$shortmode_path"`
1.220 new_path="$input_path"
1.221 fi
1.222 @@ -20363,7 +20420,7 @@
1.223 # Going to short mode and back again did indeed matter. Since short mode is
1.224 # case insensitive, let's make it lowercase to improve readability.
1.225 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.226 - # Now convert it back to Unix-stile (cygpath)
1.227 + # Now convert it back to Unix-style (cygpath)
1.228 input_path=`$CYGPATH -u "$shortmode_path"`
1.229 new_path="$input_path"
1.230 fi
1.231 @@ -20535,7 +20592,7 @@
1.232 # Going to short mode and back again did indeed matter. Since short mode is
1.233 # case insensitive, let's make it lowercase to improve readability.
1.234 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.235 - # Now convert it back to Unix-stile (cygpath)
1.236 + # Now convert it back to Unix-style (cygpath)
1.237 input_path=`$CYGPATH -u "$shortmode_path"`
1.238 new_path="$input_path"
1.239 fi
1.240 @@ -20723,7 +20780,7 @@
1.241 # Going to short mode and back again did indeed matter. Since short mode is
1.242 # case insensitive, let's make it lowercase to improve readability.
1.243 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.244 - # Now convert it back to Unix-stile (cygpath)
1.245 + # Now convert it back to Unix-style (cygpath)
1.246 input_path=`$CYGPATH -u "$shortmode_path"`
1.247 new_path="$input_path"
1.248 fi
1.249 @@ -21051,7 +21108,7 @@
1.250 # Going to short mode and back again did indeed matter. Since short mode is
1.251 # case insensitive, let's make it lowercase to improve readability.
1.252 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.253 - # Now convert it back to Unix-stile (cygpath)
1.254 + # Now convert it back to Unix-style (cygpath)
1.255 input_path=`$CYGPATH -u "$shortmode_path"`
1.256 new_path="$input_path"
1.257 fi
1.258 @@ -21266,7 +21323,7 @@
1.259 # Going to short mode and back again did indeed matter. Since short mode is
1.260 # case insensitive, let's make it lowercase to improve readability.
1.261 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.262 - # Now convert it back to Unix-stile (cygpath)
1.263 + # Now convert it back to Unix-style (cygpath)
1.264 input_path=`$CYGPATH -u "$shortmode_path"`
1.265 new_path="$input_path"
1.266 fi
1.267 @@ -21446,7 +21503,7 @@
1.268 # Going to short mode and back again did indeed matter. Since short mode is
1.269 # case insensitive, let's make it lowercase to improve readability.
1.270 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.271 - # Now convert it back to Unix-stile (cygpath)
1.272 + # Now convert it back to Unix-style (cygpath)
1.273 input_path=`$CYGPATH -u "$shortmode_path"`
1.274 new_path="$input_path"
1.275 fi
1.276 @@ -21654,7 +21711,7 @@
1.277 # Going to short mode and back again did indeed matter. Since short mode is
1.278 # case insensitive, let's make it lowercase to improve readability.
1.279 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.280 - # Now convert it back to Unix-stile (cygpath)
1.281 + # Now convert it back to Unix-style (cygpath)
1.282 input_path=`$CYGPATH -u "$shortmode_path"`
1.283 new_path="$input_path"
1.284 fi
1.285 @@ -21834,7 +21891,7 @@
1.286 # Going to short mode and back again did indeed matter. Since short mode is
1.287 # case insensitive, let's make it lowercase to improve readability.
1.288 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.289 - # Now convert it back to Unix-stile (cygpath)
1.290 + # Now convert it back to Unix-style (cygpath)
1.291 input_path=`$CYGPATH -u "$shortmode_path"`
1.292 new_path="$input_path"
1.293 fi
1.294 @@ -22042,7 +22099,7 @@
1.295 # Going to short mode and back again did indeed matter. Since short mode is
1.296 # case insensitive, let's make it lowercase to improve readability.
1.297 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.298 - # Now convert it back to Unix-stile (cygpath)
1.299 + # Now convert it back to Unix-style (cygpath)
1.300 input_path=`$CYGPATH -u "$shortmode_path"`
1.301 new_path="$input_path"
1.302 fi
1.303 @@ -22222,7 +22279,7 @@
1.304 # Going to short mode and back again did indeed matter. Since short mode is
1.305 # case insensitive, let's make it lowercase to improve readability.
1.306 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.307 - # Now convert it back to Unix-stile (cygpath)
1.308 + # Now convert it back to Unix-style (cygpath)
1.309 input_path=`$CYGPATH -u "$shortmode_path"`
1.310 new_path="$input_path"
1.311 fi
1.312 @@ -22430,7 +22487,7 @@
1.313 # Going to short mode and back again did indeed matter. Since short mode is
1.314 # case insensitive, let's make it lowercase to improve readability.
1.315 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.316 - # Now convert it back to Unix-stile (cygpath)
1.317 + # Now convert it back to Unix-style (cygpath)
1.318 input_path=`$CYGPATH -u "$shortmode_path"`
1.319 new_path="$input_path"
1.320 fi
1.321 @@ -22610,7 +22667,7 @@
1.322 # Going to short mode and back again did indeed matter. Since short mode is
1.323 # case insensitive, let's make it lowercase to improve readability.
1.324 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.325 - # Now convert it back to Unix-stile (cygpath)
1.326 + # Now convert it back to Unix-style (cygpath)
1.327 input_path=`$CYGPATH -u "$shortmode_path"`
1.328 new_path="$input_path"
1.329 fi
1.330 @@ -22805,7 +22862,7 @@
1.331 # Going to short mode and back again did indeed matter. Since short mode is
1.332 # case insensitive, let's make it lowercase to improve readability.
1.333 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.334 - # Now convert it back to Unix-stile (cygpath)
1.335 + # Now convert it back to Unix-style (cygpath)
1.336 input_path=`$CYGPATH -u "$shortmode_path"`
1.337 new_path="$input_path"
1.338 fi
1.339 @@ -22983,7 +23040,7 @@
1.340 # Going to short mode and back again did indeed matter. Since short mode is
1.341 # case insensitive, let's make it lowercase to improve readability.
1.342 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.343 - # Now convert it back to Unix-stile (cygpath)
1.344 + # Now convert it back to Unix-style (cygpath)
1.345 input_path=`$CYGPATH -u "$shortmode_path"`
1.346 new_path="$input_path"
1.347 fi
1.348 @@ -23179,7 +23236,7 @@
1.349 # Going to short mode and back again did indeed matter. Since short mode is
1.350 # case insensitive, let's make it lowercase to improve readability.
1.351 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.352 - # Now convert it back to Unix-stile (cygpath)
1.353 + # Now convert it back to Unix-style (cygpath)
1.354 input_path=`$CYGPATH -u "$shortmode_path"`
1.355 new_path="$input_path"
1.356 fi
1.357 @@ -23357,7 +23414,7 @@
1.358 # Going to short mode and back again did indeed matter. Since short mode is
1.359 # case insensitive, let's make it lowercase to improve readability.
1.360 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.361 - # Now convert it back to Unix-stile (cygpath)
1.362 + # Now convert it back to Unix-style (cygpath)
1.363 input_path=`$CYGPATH -u "$shortmode_path"`
1.364 new_path="$input_path"
1.365 fi
1.366 @@ -23552,7 +23609,7 @@
1.367 # Going to short mode and back again did indeed matter. Since short mode is
1.368 # case insensitive, let's make it lowercase to improve readability.
1.369 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.370 - # Now convert it back to Unix-stile (cygpath)
1.371 + # Now convert it back to Unix-style (cygpath)
1.372 input_path=`$CYGPATH -u "$shortmode_path"`
1.373 new_path="$input_path"
1.374 fi
1.375 @@ -23730,7 +23787,7 @@
1.376 # Going to short mode and back again did indeed matter. Since short mode is
1.377 # case insensitive, let's make it lowercase to improve readability.
1.378 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.379 - # Now convert it back to Unix-stile (cygpath)
1.380 + # Now convert it back to Unix-style (cygpath)
1.381 input_path=`$CYGPATH -u "$shortmode_path"`
1.382 new_path="$input_path"
1.383 fi
1.384 @@ -23926,7 +23983,7 @@
1.385 # Going to short mode and back again did indeed matter. Since short mode is
1.386 # case insensitive, let's make it lowercase to improve readability.
1.387 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.388 - # Now convert it back to Unix-stile (cygpath)
1.389 + # Now convert it back to Unix-style (cygpath)
1.390 input_path=`$CYGPATH -u "$shortmode_path"`
1.391 new_path="$input_path"
1.392 fi
1.393 @@ -24104,7 +24161,7 @@
1.394 # Going to short mode and back again did indeed matter. Since short mode is
1.395 # case insensitive, let's make it lowercase to improve readability.
1.396 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.397 - # Now convert it back to Unix-stile (cygpath)
1.398 + # Now convert it back to Unix-style (cygpath)
1.399 input_path=`$CYGPATH -u "$shortmode_path"`
1.400 new_path="$input_path"
1.401 fi
1.402 @@ -24281,7 +24338,7 @@
1.403 # Going to short mode and back again did indeed matter. Since short mode is
1.404 # case insensitive, let's make it lowercase to improve readability.
1.405 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.406 - # Now convert it back to Unix-stile (cygpath)
1.407 + # Now convert it back to Unix-style (cygpath)
1.408 input_path=`$CYGPATH -u "$shortmode_path"`
1.409 new_path="$input_path"
1.410 fi
1.411 @@ -25211,11 +25268,15 @@
1.412 ORG_CXXFLAGS="$CXXFLAGS"
1.413 ORG_OBJCFLAGS="$OBJCFLAGS"
1.414
1.415 + # autoconf magic only relies on PATH, so update it if tools dir is specified
1.416 + OLD_PATH="$PATH"
1.417 +
1.418 # On Windows, we need to detect the visual studio installation first.
1.419 # This will change the PATH, but we need to keep that new PATH even
1.420 # after toolchain detection is done, since the compiler (on x86) uses
1.421 # it for DLL resolution in runtime.
1.422 - if test "x$OPENJDK_BUILD_OS" = "xwindows" && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
1.423 + if test "x$OPENJDK_BUILD_OS" = "xwindows" \
1.424 + && test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
1.425
1.426 # Store path to cygwin link.exe to help excluding it when searching for
1.427 # VS linker. This must be done before changing the PATH when looking for VS.
1.428 @@ -25293,6 +25354,56 @@
1.429 done
1.430
1.431 exit 0
1.432 + elif test "x$DEVKIT_VS_VERSION" != x; then
1.433 + VS_VERSION=$DEVKIT_VS_VERSION
1.434 + TOOLCHAIN_VERSION=$VS_VERSION
1.435 + eval VS_DESCRIPTION="\${VS_DESCRIPTION_${VS_VERSION}}"
1.436 + eval VS_VERSION_INTERNAL="\${VS_VERSION_INTERNAL_${VS_VERSION}}"
1.437 + eval MSVCR_NAME="\${VS_MSVCR_${VS_VERSION}}"
1.438 + eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}"
1.439 + eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
1.440 + VS_PATH="$TOOLCHAIN_PATH:$PATH"
1.441 +
1.442 + # Convert DEVKIT_VS_INCLUDE into windows style VS_INCLUDE so that it
1.443 + # can still be exported as INCLUDE for compiler invocations without
1.444 + # SYSROOT_CFLAGS
1.445 + OLDIFS="$IFS"
1.446 + IFS=";"
1.447 + for i in $DEVKIT_VS_INCLUDE; do
1.448 + ipath=$i
1.449 +
1.450 + unix_path="$ipath"
1.451 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.452 + windows_path=`$CYGPATH -m "$unix_path"`
1.453 + ipath="$windows_path"
1.454 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.455 + windows_path=`cmd //c echo $unix_path`
1.456 + ipath="$windows_path"
1.457 + fi
1.458 +
1.459 + VS_INCLUDE="$VS_INCLUDE;$ipath"
1.460 + done
1.461 + # Convert DEVKIT_VS_LIB into VS_LIB so that it can still be exported
1.462 + # as LIB for compiler invocations without SYSROOT_LDFLAGS
1.463 + for i in $DEVKIT_VS_LIB; do
1.464 + libpath=$i
1.465 +
1.466 + unix_path="$libpath"
1.467 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.468 + windows_path=`$CYGPATH -m "$unix_path"`
1.469 + libpath="$windows_path"
1.470 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.471 + windows_path=`cmd //c echo $unix_path`
1.472 + libpath="$windows_path"
1.473 + fi
1.474 +
1.475 + VS_LIB="$VS_LIB;$libpath"
1.476 + done
1.477 + IFS="$OLDIFS"
1.478 +
1.479 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found devkit $VS_DESCRIPTION" >&5
1.480 +$as_echo "$as_me: Found devkit $VS_DESCRIPTION" >&6;}
1.481 +
1.482 elif test "x$with_toolchain_version" != x; then
1.483 # User override; check that it is valid
1.484 if test "x${VALID_VS_VERSIONS/$with_toolchain_version/}" = "x${VALID_VS_VERSIONS}"; then
1.485 @@ -25865,8 +25976,10 @@
1.486 done
1.487
1.488
1.489 - if test "x$VS_ENV_CMD" != x; then
1.490 - # We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file.
1.491 + # If we have a devkit, skip all of the below.
1.492 + if test "x$DEVKIT_VS_VERSION" = x; then
1.493 + if test "x$VS_ENV_CMD" != x; then
1.494 + # We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file.
1.495
1.496 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.497
1.498 @@ -25963,7 +26076,7 @@
1.499 # Going to short mode and back again did indeed matter. Since short mode is
1.500 # case insensitive, let's make it lowercase to improve readability.
1.501 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.502 - # Now convert it back to Unix-stile (cygpath)
1.503 + # Now convert it back to Unix-style (cygpath)
1.504 input_path=`$CYGPATH -u "$shortmode_path"`
1.505 new_path="$input_path"
1.506 fi
1.507 @@ -26150,17 +26263,17 @@
1.508 fi
1.509
1.510
1.511 - # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
1.512 - { $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
1.513 + # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
1.514 + { $as_echo "$as_me:${as_lineno-$LINENO}: Trying to extract Visual Studio environment variables" >&5
1.515 $as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;}
1.516
1.517 - # We need to create a couple of temporary files.
1.518 - VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
1.519 - $MKDIR -p $VS_ENV_TMP_DIR
1.520 -
1.521 - # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
1.522 - # Instead create a shell script which will set the relevant variables when run.
1.523 - WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
1.524 + # We need to create a couple of temporary files.
1.525 + VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
1.526 + $MKDIR -p $VS_ENV_TMP_DIR
1.527 +
1.528 + # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
1.529 + # Instead create a shell script which will set the relevant variables when run.
1.530 + WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
1.531
1.532 unix_path="$WINPATH_VS_ENV_CMD"
1.533 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.534 @@ -26171,7 +26284,7 @@
1.535 WINPATH_VS_ENV_CMD="$windows_path"
1.536 fi
1.537
1.538 - WINPATH_BASH="$BASH"
1.539 + WINPATH_BASH="$BASH"
1.540
1.541 unix_path="$WINPATH_BASH"
1.542 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.543 @@ -26183,59 +26296,67 @@
1.544 fi
1.545
1.546
1.547 - # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
1.548 - # script (executable by bash) that will setup the important variables.
1.549 - EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
1.550 - $ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE
1.551 - # This will end up something like:
1.552 - # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
1.553 - $ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
1.554 - # These will end up something like:
1.555 - # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
1.556 - # The trailing space for everyone except PATH is no typo, but is needed due
1.557 - # to trailing \ in the Windows paths. These will be stripped later.
1.558 - $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
1.559 - $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
1.560 - $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
1.561 - $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
1.562 - $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
1.563 - $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' >> $EXTRACT_VC_ENV_BAT_FILE
1.564 -
1.565 - # Now execute the newly created bat file.
1.566 - # The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
1.567 - # Change directory so we don't need to mess with Windows paths in redirects.
1.568 - cd $VS_ENV_TMP_DIR
1.569 - cmd /c extract-vs-env.bat | $CAT
1.570 - cd $CURDIR
1.571 -
1.572 - if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
1.573 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not succesfully extract the envionment variables needed for the VS setup." >&5
1.574 + # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
1.575 + # script (executable by bash) that will setup the important variables.
1.576 + EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
1.577 + $ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE
1.578 + # This will end up something like:
1.579 + # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
1.580 + $ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
1.581 + # These will end up something like:
1.582 + # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
1.583 + # The trailing space for everyone except PATH is no typo, but is needed due
1.584 + # to trailing \ in the Windows paths. These will be stripped later.
1.585 + $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' \
1.586 + >> $EXTRACT_VC_ENV_BAT_FILE
1.587 + $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE \" >> set-vs-env.sh' \
1.588 + >> $EXTRACT_VC_ENV_BAT_FILE
1.589 + $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB \" >> set-vs-env.sh' \
1.590 + >> $EXTRACT_VC_ENV_BAT_FILE
1.591 + $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' \
1.592 + >> $EXTRACT_VC_ENV_BAT_FILE
1.593 + $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' \
1.594 + >> $EXTRACT_VC_ENV_BAT_FILE
1.595 + $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' \
1.596 + >> $EXTRACT_VC_ENV_BAT_FILE
1.597 +
1.598 + # Now execute the newly created bat file.
1.599 + # The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
1.600 + # Change directory so we don't need to mess with Windows paths in redirects.
1.601 + cd $VS_ENV_TMP_DIR
1.602 + cmd /c extract-vs-env.bat | $CAT
1.603 + cd $CURDIR
1.604 +
1.605 + if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
1.606 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not succesfully extract the envionment variables needed for the VS setup." >&5
1.607 $as_echo "$as_me: Could not succesfully extract the envionment variables needed for the VS setup." >&6;}
1.608 - { $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
1.609 + { $as_echo "$as_me:${as_lineno-$LINENO}: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&5
1.610 $as_echo "$as_me: Try setting --with-tools-dir to the VC/bin directory within the VS installation" >&6;}
1.611 - { $as_echo "$as_me:${as_lineno-$LINENO}: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&5
1.612 + { $as_echo "$as_me:${as_lineno-$LINENO}: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&5
1.613 $as_echo "$as_me: or run \"bash.exe -l\" from a VS command prompt and then run configure from there." >&6;}
1.614 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.615 - fi
1.616 -
1.617 - # Now set all paths and other env variables. This will allow the rest of
1.618 - # the configure script to find and run the compiler in the proper way.
1.619 - { $as_echo "$as_me:${as_lineno-$LINENO}: Setting extracted environment variables" >&5
1.620 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.621 + fi
1.622 +
1.623 + # Now set all paths and other env variables. This will allow the rest of
1.624 + # the configure script to find and run the compiler in the proper way.
1.625 + { $as_echo "$as_me:${as_lineno-$LINENO}: Setting extracted environment variables" >&5
1.626 $as_echo "$as_me: Setting extracted environment variables" >&6;}
1.627 - . $VS_ENV_TMP_DIR/set-vs-env.sh
1.628 - # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
1.629 - # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
1.630 - else
1.631 - # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
1.632 - { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio installation, checking current environment" >&5
1.633 + . $VS_ENV_TMP_DIR/set-vs-env.sh
1.634 + # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we
1.635 + # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR.
1.636 + else
1.637 + # We did not find a vsvars bat file, let's hope we are run from a VS command prompt.
1.638 + { $as_echo "$as_me:${as_lineno-$LINENO}: Cannot locate a valid Visual Studio installation, checking current environment" >&5
1.639 $as_echo "$as_me: Cannot locate a valid Visual Studio installation, checking current environment" >&6;}
1.640 + fi
1.641 fi
1.642
1.643 # At this point, we should have correct variables in the environment, or we can't continue.
1.644 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Visual Studio variables" >&5
1.645 $as_echo_n "checking for Visual Studio variables... " >&6; }
1.646
1.647 - if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x || test "x$WINDOWSSDKDIR" != x; then
1.648 + if test "x$VCINSTALLDIR" != x || test "x$WindowsSDKDir" != x \
1.649 + || test "x$WINDOWSSDKDIR" != x || test "x$DEVKIT_NAME" != x; then
1.650 if test "x$VS_INCLUDE" = x || test "x$VS_LIB" = x; then
1.651 { $as_echo "$as_me:${as_lineno-$LINENO}: result: present but broken" >&5
1.652 $as_echo "present but broken" >&6; }
1.653 @@ -26285,9 +26406,6 @@
1.654 export LIB="$VS_LIB"
1.655 fi
1.656
1.657 - # autoconf magic only relies on PATH, so update it if tools dir is specified
1.658 - OLD_PATH="$PATH"
1.659 -
1.660 # Before we locate the compilers, we need to sanitize the Xcode build environment
1.661 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
1.662 # determine path to Xcode developer directory
1.663 @@ -26750,7 +26868,7 @@
1.664 # Going to short mode and back again did indeed matter. Since short mode is
1.665 # case insensitive, let's make it lowercase to improve readability.
1.666 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.667 - # Now convert it back to Unix-stile (cygpath)
1.668 + # Now convert it back to Unix-style (cygpath)
1.669 input_path=`$CYGPATH -u "$shortmode_path"`
1.670 new_path="$input_path"
1.671 fi
1.672 @@ -27207,7 +27325,7 @@
1.673 # Going to short mode and back again did indeed matter. Since short mode is
1.674 # case insensitive, let's make it lowercase to improve readability.
1.675 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.676 - # Now convert it back to Unix-stile (cygpath)
1.677 + # Now convert it back to Unix-style (cygpath)
1.678 input_path=`$CYGPATH -u "$shortmode_path"`
1.679 new_path="$input_path"
1.680 fi
1.681 @@ -28492,7 +28610,7 @@
1.682 # Going to short mode and back again did indeed matter. Since short mode is
1.683 # case insensitive, let's make it lowercase to improve readability.
1.684 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.685 - # Now convert it back to Unix-stile (cygpath)
1.686 + # Now convert it back to Unix-style (cygpath)
1.687 input_path=`$CYGPATH -u "$shortmode_path"`
1.688 new_path="$input_path"
1.689 fi
1.690 @@ -28949,7 +29067,7 @@
1.691 # Going to short mode and back again did indeed matter. Since short mode is
1.692 # case insensitive, let's make it lowercase to improve readability.
1.693 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.694 - # Now convert it back to Unix-stile (cygpath)
1.695 + # Now convert it back to Unix-style (cygpath)
1.696 input_path=`$CYGPATH -u "$shortmode_path"`
1.697 new_path="$input_path"
1.698 fi
1.699 @@ -29839,7 +29957,7 @@
1.700 # Going to short mode and back again did indeed matter. Since short mode is
1.701 # case insensitive, let's make it lowercase to improve readability.
1.702 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.703 - # Now convert it back to Unix-stile (cygpath)
1.704 + # Now convert it back to Unix-style (cygpath)
1.705 input_path=`$CYGPATH -u "$shortmode_path"`
1.706 new_path="$input_path"
1.707 fi
1.708 @@ -30254,7 +30372,7 @@
1.709 # Going to short mode and back again did indeed matter. Since short mode is
1.710 # case insensitive, let's make it lowercase to improve readability.
1.711 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.712 - # Now convert it back to Unix-stile (cygpath)
1.713 + # Now convert it back to Unix-style (cygpath)
1.714 input_path=`$CYGPATH -u "$shortmode_path"`
1.715 new_path="$input_path"
1.716 fi
1.717 @@ -30598,7 +30716,7 @@
1.718 # Going to short mode and back again did indeed matter. Since short mode is
1.719 # case insensitive, let's make it lowercase to improve readability.
1.720 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.721 - # Now convert it back to Unix-stile (cygpath)
1.722 + # Now convert it back to Unix-style (cygpath)
1.723 input_path=`$CYGPATH -u "$shortmode_path"`
1.724 new_path="$input_path"
1.725 fi
1.726 @@ -31093,7 +31211,7 @@
1.727 # Going to short mode and back again did indeed matter. Since short mode is
1.728 # case insensitive, let's make it lowercase to improve readability.
1.729 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.730 - # Now convert it back to Unix-stile (cygpath)
1.731 + # Now convert it back to Unix-style (cygpath)
1.732 input_path=`$CYGPATH -u "$shortmode_path"`
1.733 new_path="$input_path"
1.734 fi
1.735 @@ -31721,7 +31839,7 @@
1.736 # Going to short mode and back again did indeed matter. Since short mode is
1.737 # case insensitive, let's make it lowercase to improve readability.
1.738 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.739 - # Now convert it back to Unix-stile (cygpath)
1.740 + # Now convert it back to Unix-style (cygpath)
1.741 input_path=`$CYGPATH -u "$shortmode_path"`
1.742 new_path="$input_path"
1.743 fi
1.744 @@ -32257,7 +32375,7 @@
1.745 # Going to short mode and back again did indeed matter. Since short mode is
1.746 # case insensitive, let's make it lowercase to improve readability.
1.747 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.748 - # Now convert it back to Unix-stile (cygpath)
1.749 + # Now convert it back to Unix-style (cygpath)
1.750 input_path=`$CYGPATH -u "$shortmode_path"`
1.751 new_path="$input_path"
1.752 fi
1.753 @@ -32725,7 +32843,7 @@
1.754 # Going to short mode and back again did indeed matter. Since short mode is
1.755 # case insensitive, let's make it lowercase to improve readability.
1.756 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.757 - # Now convert it back to Unix-stile (cygpath)
1.758 + # Now convert it back to Unix-style (cygpath)
1.759 input_path=`$CYGPATH -u "$shortmode_path"`
1.760 new_path="$input_path"
1.761 fi
1.762 @@ -33066,7 +33184,7 @@
1.763 # Going to short mode and back again did indeed matter. Since short mode is
1.764 # case insensitive, let's make it lowercase to improve readability.
1.765 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.766 - # Now convert it back to Unix-stile (cygpath)
1.767 + # Now convert it back to Unix-style (cygpath)
1.768 input_path=`$CYGPATH -u "$shortmode_path"`
1.769 new_path="$input_path"
1.770 fi
1.771 @@ -33403,7 +33521,7 @@
1.772 # Going to short mode and back again did indeed matter. Since short mode is
1.773 # case insensitive, let's make it lowercase to improve readability.
1.774 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.775 - # Now convert it back to Unix-stile (cygpath)
1.776 + # Now convert it back to Unix-style (cygpath)
1.777 input_path=`$CYGPATH -u "$shortmode_path"`
1.778 new_path="$input_path"
1.779 fi
1.780 @@ -33722,7 +33840,7 @@
1.781 # Going to short mode and back again did indeed matter. Since short mode is
1.782 # case insensitive, let's make it lowercase to improve readability.
1.783 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.784 - # Now convert it back to Unix-stile (cygpath)
1.785 + # Now convert it back to Unix-style (cygpath)
1.786 input_path=`$CYGPATH -u "$shortmode_path"`
1.787 new_path="$input_path"
1.788 fi
1.789 @@ -34237,7 +34355,7 @@
1.790 # Going to short mode and back again did indeed matter. Since short mode is
1.791 # case insensitive, let's make it lowercase to improve readability.
1.792 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.793 - # Now convert it back to Unix-stile (cygpath)
1.794 + # Now convert it back to Unix-style (cygpath)
1.795 input_path=`$CYGPATH -u "$shortmode_path"`
1.796 new_path="$input_path"
1.797 fi
1.798 @@ -34705,7 +34823,7 @@
1.799 # Going to short mode and back again did indeed matter. Since short mode is
1.800 # case insensitive, let's make it lowercase to improve readability.
1.801 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.802 - # Now convert it back to Unix-stile (cygpath)
1.803 + # Now convert it back to Unix-style (cygpath)
1.804 input_path=`$CYGPATH -u "$shortmode_path"`
1.805 new_path="$input_path"
1.806 fi
1.807 @@ -35173,7 +35291,7 @@
1.808 # Going to short mode and back again did indeed matter. Since short mode is
1.809 # case insensitive, let's make it lowercase to improve readability.
1.810 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.811 - # Now convert it back to Unix-stile (cygpath)
1.812 + # Now convert it back to Unix-style (cygpath)
1.813 input_path=`$CYGPATH -u "$shortmode_path"`
1.814 new_path="$input_path"
1.815 fi
1.816 @@ -35642,7 +35760,7 @@
1.817 # Going to short mode and back again did indeed matter. Since short mode is
1.818 # case insensitive, let's make it lowercase to improve readability.
1.819 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.820 - # Now convert it back to Unix-stile (cygpath)
1.821 + # Now convert it back to Unix-style (cygpath)
1.822 input_path=`$CYGPATH -u "$shortmode_path"`
1.823 new_path="$input_path"
1.824 fi
1.825 @@ -36222,7 +36340,7 @@
1.826 # Going to short mode and back again did indeed matter. Since short mode is
1.827 # case insensitive, let's make it lowercase to improve readability.
1.828 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.829 - # Now convert it back to Unix-stile (cygpath)
1.830 + # Now convert it back to Unix-style (cygpath)
1.831 input_path=`$CYGPATH -u "$shortmode_path"`
1.832 new_path="$input_path"
1.833 fi
1.834 @@ -36843,7 +36961,7 @@
1.835 # Going to short mode and back again did indeed matter. Since short mode is
1.836 # case insensitive, let's make it lowercase to improve readability.
1.837 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.838 - # Now convert it back to Unix-stile (cygpath)
1.839 + # Now convert it back to Unix-style (cygpath)
1.840 input_path=`$CYGPATH -u "$shortmode_path"`
1.841 new_path="$input_path"
1.842 fi
1.843 @@ -37430,7 +37548,7 @@
1.844 # Going to short mode and back again did indeed matter. Since short mode is
1.845 # case insensitive, let's make it lowercase to improve readability.
1.846 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.847 - # Now convert it back to Unix-stile (cygpath)
1.848 + # Now convert it back to Unix-style (cygpath)
1.849 input_path=`$CYGPATH -u "$shortmode_path"`
1.850 new_path="$input_path"
1.851 fi
1.852 @@ -38014,7 +38132,7 @@
1.853 # Going to short mode and back again did indeed matter. Since short mode is
1.854 # case insensitive, let's make it lowercase to improve readability.
1.855 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.856 - # Now convert it back to Unix-stile (cygpath)
1.857 + # Now convert it back to Unix-style (cygpath)
1.858 input_path=`$CYGPATH -u "$shortmode_path"`
1.859 new_path="$input_path"
1.860 fi
1.861 @@ -38507,7 +38625,7 @@
1.862 # Going to short mode and back again did indeed matter. Since short mode is
1.863 # case insensitive, let's make it lowercase to improve readability.
1.864 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.865 - # Now convert it back to Unix-stile (cygpath)
1.866 + # Now convert it back to Unix-style (cygpath)
1.867 input_path=`$CYGPATH -u "$shortmode_path"`
1.868 new_path="$input_path"
1.869 fi
1.870 @@ -38975,7 +39093,7 @@
1.871 # Going to short mode and back again did indeed matter. Since short mode is
1.872 # case insensitive, let's make it lowercase to improve readability.
1.873 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.874 - # Now convert it back to Unix-stile (cygpath)
1.875 + # Now convert it back to Unix-style (cygpath)
1.876 input_path=`$CYGPATH -u "$shortmode_path"`
1.877 new_path="$input_path"
1.878 fi
1.879 @@ -39443,7 +39561,7 @@
1.880 # Going to short mode and back again did indeed matter. Since short mode is
1.881 # case insensitive, let's make it lowercase to improve readability.
1.882 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.883 - # Now convert it back to Unix-stile (cygpath)
1.884 + # Now convert it back to Unix-style (cygpath)
1.885 input_path=`$CYGPATH -u "$shortmode_path"`
1.886 new_path="$input_path"
1.887 fi
1.888 @@ -39823,7 +39941,7 @@
1.889 # Going to short mode and back again did indeed matter. Since short mode is
1.890 # case insensitive, let's make it lowercase to improve readability.
1.891 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.892 - # Now convert it back to Unix-stile (cygpath)
1.893 + # Now convert it back to Unix-style (cygpath)
1.894 input_path=`$CYGPATH -u "$shortmode_path"`
1.895 new_path="$input_path"
1.896 fi
1.897 @@ -43360,7 +43478,7 @@
1.898 # Going to short mode and back again did indeed matter. Since short mode is
1.899 # case insensitive, let's make it lowercase to improve readability.
1.900 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.901 - # Now convert it back to Unix-stile (cygpath)
1.902 + # Now convert it back to Unix-style (cygpath)
1.903 input_path=`$CYGPATH -u "$shortmode_path"`
1.904 new_path="$input_path"
1.905 fi
1.906 @@ -43482,7 +43600,7 @@
1.907 # Going to short mode and back again did indeed matter. Since short mode is
1.908 # case insensitive, let's make it lowercase to improve readability.
1.909 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.910 - # Now convert it back to Unix-stile (cygpath)
1.911 + # Now convert it back to Unix-style (cygpath)
1.912 input_path=`$CYGPATH -u "$shortmode_path"`
1.913 new_path="$input_path"
1.914 fi
1.915 @@ -43687,7 +43805,7 @@
1.916 # Going to short mode and back again did indeed matter. Since short mode is
1.917 # case insensitive, let's make it lowercase to improve readability.
1.918 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.919 - # Now convert it back to Unix-stile (cygpath)
1.920 + # Now convert it back to Unix-style (cygpath)
1.921 input_path=`$CYGPATH -u "$shortmode_path"`
1.922 new_path="$input_path"
1.923 fi
1.924 @@ -43809,7 +43927,7 @@
1.925 # Going to short mode and back again did indeed matter. Since short mode is
1.926 # case insensitive, let's make it lowercase to improve readability.
1.927 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.928 - # Now convert it back to Unix-stile (cygpath)
1.929 + # Now convert it back to Unix-style (cygpath)
1.930 input_path=`$CYGPATH -u "$shortmode_path"`
1.931 new_path="$input_path"
1.932 fi
1.933 @@ -44275,7 +44393,7 @@
1.934 # Going to short mode and back again did indeed matter. Since short mode is
1.935 # case insensitive, let's make it lowercase to improve readability.
1.936 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.937 - # Now convert it back to Unix-stile (cygpath)
1.938 + # Now convert it back to Unix-style (cygpath)
1.939 input_path=`$CYGPATH -u "$shortmode_path"`
1.940 new_path="$input_path"
1.941 fi
1.942 @@ -44397,7 +44515,7 @@
1.943 # Going to short mode and back again did indeed matter. Since short mode is
1.944 # case insensitive, let's make it lowercase to improve readability.
1.945 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.946 - # Now convert it back to Unix-stile (cygpath)
1.947 + # Now convert it back to Unix-style (cygpath)
1.948 input_path=`$CYGPATH -u "$shortmode_path"`
1.949 new_path="$input_path"
1.950 fi
1.951 @@ -44577,7 +44695,7 @@
1.952 # Going to short mode and back again did indeed matter. Since short mode is
1.953 # case insensitive, let's make it lowercase to improve readability.
1.954 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.955 - # Now convert it back to Unix-stile (cygpath)
1.956 + # Now convert it back to Unix-style (cygpath)
1.957 input_path=`$CYGPATH -u "$shortmode_path"`
1.958 new_path="$input_path"
1.959 fi
1.960 @@ -44699,7 +44817,7 @@
1.961 # Going to short mode and back again did indeed matter. Since short mode is
1.962 # case insensitive, let's make it lowercase to improve readability.
1.963 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.964 - # Now convert it back to Unix-stile (cygpath)
1.965 + # Now convert it back to Unix-style (cygpath)
1.966 input_path=`$CYGPATH -u "$shortmode_path"`
1.967 new_path="$input_path"
1.968 fi
1.969 @@ -44870,7 +44988,7 @@
1.970 # Going to short mode and back again did indeed matter. Since short mode is
1.971 # case insensitive, let's make it lowercase to improve readability.
1.972 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.973 - # Now convert it back to Unix-stile (cygpath)
1.974 + # Now convert it back to Unix-style (cygpath)
1.975 input_path=`$CYGPATH -u "$shortmode_path"`
1.976 new_path="$input_path"
1.977 fi
1.978 @@ -44992,7 +45110,7 @@
1.979 # Going to short mode and back again did indeed matter. Since short mode is
1.980 # case insensitive, let's make it lowercase to improve readability.
1.981 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.982 - # Now convert it back to Unix-stile (cygpath)
1.983 + # Now convert it back to Unix-style (cygpath)
1.984 input_path=`$CYGPATH -u "$shortmode_path"`
1.985 new_path="$input_path"
1.986 fi
1.987 @@ -45163,7 +45281,7 @@
1.988 # Going to short mode and back again did indeed matter. Since short mode is
1.989 # case insensitive, let's make it lowercase to improve readability.
1.990 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.991 - # Now convert it back to Unix-stile (cygpath)
1.992 + # Now convert it back to Unix-style (cygpath)
1.993 input_path=`$CYGPATH -u "$shortmode_path"`
1.994 new_path="$input_path"
1.995 fi
1.996 @@ -45285,7 +45403,7 @@
1.997 # Going to short mode and back again did indeed matter. Since short mode is
1.998 # case insensitive, let's make it lowercase to improve readability.
1.999 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1000 - # Now convert it back to Unix-stile (cygpath)
1.1001 + # Now convert it back to Unix-style (cygpath)
1.1002 input_path=`$CYGPATH -u "$shortmode_path"`
1.1003 new_path="$input_path"
1.1004 fi
1.1005 @@ -45457,7 +45575,7 @@
1.1006 # Going to short mode and back again did indeed matter. Since short mode is
1.1007 # case insensitive, let's make it lowercase to improve readability.
1.1008 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1009 - # Now convert it back to Unix-stile (cygpath)
1.1010 + # Now convert it back to Unix-style (cygpath)
1.1011 input_path=`$CYGPATH -u "$shortmode_path"`
1.1012 new_path="$input_path"
1.1013 fi
1.1014 @@ -45579,7 +45697,7 @@
1.1015 # Going to short mode and back again did indeed matter. Since short mode is
1.1016 # case insensitive, let's make it lowercase to improve readability.
1.1017 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1018 - # Now convert it back to Unix-stile (cygpath)
1.1019 + # Now convert it back to Unix-style (cygpath)
1.1020 input_path=`$CYGPATH -u "$shortmode_path"`
1.1021 new_path="$input_path"
1.1022 fi
1.1023 @@ -45752,7 +45870,7 @@
1.1024 # Going to short mode and back again did indeed matter. Since short mode is
1.1025 # case insensitive, let's make it lowercase to improve readability.
1.1026 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1027 - # Now convert it back to Unix-stile (cygpath)
1.1028 + # Now convert it back to Unix-style (cygpath)
1.1029 input_path=`$CYGPATH -u "$shortmode_path"`
1.1030 new_path="$input_path"
1.1031 fi
1.1032 @@ -45874,7 +45992,7 @@
1.1033 # Going to short mode and back again did indeed matter. Since short mode is
1.1034 # case insensitive, let's make it lowercase to improve readability.
1.1035 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1036 - # Now convert it back to Unix-stile (cygpath)
1.1037 + # Now convert it back to Unix-style (cygpath)
1.1038 input_path=`$CYGPATH -u "$shortmode_path"`
1.1039 new_path="$input_path"
1.1040 fi
1.1041 @@ -46043,7 +46161,7 @@
1.1042 # Going to short mode and back again did indeed matter. Since short mode is
1.1043 # case insensitive, let's make it lowercase to improve readability.
1.1044 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1045 - # Now convert it back to Unix-stile (cygpath)
1.1046 + # Now convert it back to Unix-style (cygpath)
1.1047 input_path=`$CYGPATH -u "$shortmode_path"`
1.1048 new_path="$input_path"
1.1049 fi
1.1050 @@ -46165,7 +46283,7 @@
1.1051 # Going to short mode and back again did indeed matter. Since short mode is
1.1052 # case insensitive, let's make it lowercase to improve readability.
1.1053 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1054 - # Now convert it back to Unix-stile (cygpath)
1.1055 + # Now convert it back to Unix-style (cygpath)
1.1056 input_path=`$CYGPATH -u "$shortmode_path"`
1.1057 new_path="$input_path"
1.1058 fi
1.1059 @@ -46334,7 +46452,7 @@
1.1060 # Going to short mode and back again did indeed matter. Since short mode is
1.1061 # case insensitive, let's make it lowercase to improve readability.
1.1062 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1063 - # Now convert it back to Unix-stile (cygpath)
1.1064 + # Now convert it back to Unix-style (cygpath)
1.1065 input_path=`$CYGPATH -u "$shortmode_path"`
1.1066 new_path="$input_path"
1.1067 fi
1.1068 @@ -46456,7 +46574,7 @@
1.1069 # Going to short mode and back again did indeed matter. Since short mode is
1.1070 # case insensitive, let's make it lowercase to improve readability.
1.1071 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1072 - # Now convert it back to Unix-stile (cygpath)
1.1073 + # Now convert it back to Unix-style (cygpath)
1.1074 input_path=`$CYGPATH -u "$shortmode_path"`
1.1075 new_path="$input_path"
1.1076 fi
1.1077 @@ -46634,7 +46752,7 @@
1.1078 # Going to short mode and back again did indeed matter. Since short mode is
1.1079 # case insensitive, let's make it lowercase to improve readability.
1.1080 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1081 - # Now convert it back to Unix-stile (cygpath)
1.1082 + # Now convert it back to Unix-style (cygpath)
1.1083 input_path=`$CYGPATH -u "$shortmode_path"`
1.1084 new_path="$input_path"
1.1085 fi
1.1086 @@ -46764,7 +46882,7 @@
1.1087 # Going to short mode and back again did indeed matter. Since short mode is
1.1088 # case insensitive, let's make it lowercase to improve readability.
1.1089 shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1090 - # Now convert it back to Unix-stile (cygpath)
1.1091 + # Now convert it back to Unix-style (cygpath)
1.1092 input_path=`$CYGPATH -u "$shortmode_path"`
1.1093 new_path="$input_path"
1.1094 fi
1.1095 @@ -48015,7 +48133,7 @@
1.1096 if test "x$with_msvcr_dll" != x; then
1.1097 # If given explicitely by user, do not probe. If not present, fail directly.
1.1098
1.1099 - DLL_NAME="$DLL_NAME"
1.1100 + DLL_NAME="$MSVCR_NAME"
1.1101 POSSIBLE_MSVC_DLL="$with_msvcr_dll"
1.1102 METHOD="--with-msvcr-dll"
1.1103 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.1104 @@ -48045,6 +48163,128 @@
1.1105 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1106 $as_echo "ok" >&6; }
1.1107 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1108 +
1.1109 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1110 +
1.1111 + # Input might be given as Windows format, start by converting to
1.1112 + # unix format.
1.1113 + path="$MSVC_DLL"
1.1114 + new_path=`$CYGPATH -u "$path"`
1.1115 +
1.1116 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1117 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1118 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1119 + # "foo.exe" is OK but "foo" is an error.
1.1120 + #
1.1121 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1122 + # It is also a way to make sure we got the proper file name for the real test later on.
1.1123 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1124 + if test "x$test_shortpath" = x; then
1.1125 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1126 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1127 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.1128 + fi
1.1129 +
1.1130 + # Call helper function which possibly converts this using DOS-style short mode.
1.1131 + # If so, the updated path is stored in $new_path.
1.1132 +
1.1133 + input_path="$new_path"
1.1134 + # Check if we need to convert this using DOS-style short mode. If the path
1.1135 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1136 + # take no chances and rewrite it.
1.1137 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1138 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1139 + if test "x$has_forbidden_chars" != x; then
1.1140 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1141 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1142 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1143 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1144 + # Going to short mode and back again did indeed matter. Since short mode is
1.1145 + # case insensitive, let's make it lowercase to improve readability.
1.1146 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1147 + # Now convert it back to Unix-style (cygpath)
1.1148 + input_path=`$CYGPATH -u "$shortmode_path"`
1.1149 + new_path="$input_path"
1.1150 + fi
1.1151 + fi
1.1152 +
1.1153 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1154 + if test "x$test_cygdrive_prefix" = x; then
1.1155 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.1156 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1157 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1158 + # a path prefixed by /cygdrive for fixpath to work.
1.1159 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.1160 + fi
1.1161 + fi
1.1162 +
1.1163 +
1.1164 + if test "x$path" != "x$new_path"; then
1.1165 + MSVC_DLL="$new_path"
1.1166 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1167 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1168 + fi
1.1169 +
1.1170 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1171 +
1.1172 + path="$MSVC_DLL"
1.1173 + has_colon=`$ECHO $path | $GREP ^.:`
1.1174 + new_path="$path"
1.1175 + if test "x$has_colon" = x; then
1.1176 + # Not in mixed or Windows style, start by that.
1.1177 + new_path=`cmd //c echo $path`
1.1178 + fi
1.1179 +
1.1180 +
1.1181 + input_path="$new_path"
1.1182 + # Check if we need to convert this using DOS-style short mode. If the path
1.1183 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1184 + # take no chances and rewrite it.
1.1185 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1186 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1187 + if test "x$has_forbidden_chars" != x; then
1.1188 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1189 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1190 + fi
1.1191 +
1.1192 +
1.1193 + windows_path="$new_path"
1.1194 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1195 + unix_path=`$CYGPATH -u "$windows_path"`
1.1196 + new_path="$unix_path"
1.1197 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1198 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1199 + new_path="$unix_path"
1.1200 + fi
1.1201 +
1.1202 + if test "x$path" != "x$new_path"; then
1.1203 + MSVC_DLL="$new_path"
1.1204 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1205 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1206 + fi
1.1207 +
1.1208 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1209 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1210 +
1.1211 + else
1.1212 + # We're on a posix platform. Hooray! :)
1.1213 + path="$MSVC_DLL"
1.1214 + has_space=`$ECHO "$path" | $GREP " "`
1.1215 + if test "x$has_space" != x; then
1.1216 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1217 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1218 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1219 + fi
1.1220 +
1.1221 + # Use eval to expand a potential ~
1.1222 + eval path="$path"
1.1223 + if test ! -f "$path" && test ! -d "$path"; then
1.1224 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1225 + fi
1.1226 +
1.1227 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1228 + fi
1.1229 +
1.1230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.1231 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.1232 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.1233 @@ -48060,36 +48300,12 @@
1.1234 if test "x$MSVC_DLL" = x; then
1.1235 as_fn_error $? "Could not find a proper $MSVCR_NAME as specified by --with-msvcr-dll" "$LINENO" 5
1.1236 fi
1.1237 - else
1.1238 -
1.1239 - VAR_NAME="MSVCR_DLL"
1.1240 - DLL_NAME="${MSVCR_NAME}"
1.1241 - MSVC_DLL=
1.1242 -
1.1243 - if test "x$MSVC_DLL" = x; then
1.1244 - # Probe: Using well-known location from Visual Studio 10.0
1.1245 - if test "x$VCINSTALLDIR" != x; then
1.1246 - CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.1247 -
1.1248 - windows_path="$CYGWIN_VC_INSTALL_DIR"
1.1249 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1250 - unix_path=`$CYGPATH -u "$windows_path"`
1.1251 - CYGWIN_VC_INSTALL_DIR="$unix_path"
1.1252 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1253 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1254 - CYGWIN_VC_INSTALL_DIR="$unix_path"
1.1255 - fi
1.1256 -
1.1257 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1258 - POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.1259 - else
1.1260 - POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.1261 - fi
1.1262 - $ECHO "POSSIBLE_MSVC_DLL $POSSIBLEMSVC_DLL"
1.1263 -
1.1264 - DLL_NAME="$DLL_NAME"
1.1265 - POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1266 - METHOD="well-known location in VCINSTALLDIR"
1.1267 + MSVCR_DLL="$MSVC_DLL"
1.1268 + elif test "x$DEVKIT_MSVCR_DLL" != x; then
1.1269 +
1.1270 + DLL_NAME="$MSVCR_NAME"
1.1271 + POSSIBLE_MSVC_DLL="$DEVKIT_MSVCR_DLL"
1.1272 + METHOD="devkit"
1.1273 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.1274 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.1275 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.1276 @@ -48117,6 +48333,128 @@
1.1277 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1278 $as_echo "ok" >&6; }
1.1279 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1280 +
1.1281 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1282 +
1.1283 + # Input might be given as Windows format, start by converting to
1.1284 + # unix format.
1.1285 + path="$MSVC_DLL"
1.1286 + new_path=`$CYGPATH -u "$path"`
1.1287 +
1.1288 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1289 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1290 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1291 + # "foo.exe" is OK but "foo" is an error.
1.1292 + #
1.1293 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1294 + # It is also a way to make sure we got the proper file name for the real test later on.
1.1295 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1296 + if test "x$test_shortpath" = x; then
1.1297 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1298 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1299 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.1300 + fi
1.1301 +
1.1302 + # Call helper function which possibly converts this using DOS-style short mode.
1.1303 + # If so, the updated path is stored in $new_path.
1.1304 +
1.1305 + input_path="$new_path"
1.1306 + # Check if we need to convert this using DOS-style short mode. If the path
1.1307 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1308 + # take no chances and rewrite it.
1.1309 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1310 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1311 + if test "x$has_forbidden_chars" != x; then
1.1312 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1313 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1314 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1315 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1316 + # Going to short mode and back again did indeed matter. Since short mode is
1.1317 + # case insensitive, let's make it lowercase to improve readability.
1.1318 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1319 + # Now convert it back to Unix-style (cygpath)
1.1320 + input_path=`$CYGPATH -u "$shortmode_path"`
1.1321 + new_path="$input_path"
1.1322 + fi
1.1323 + fi
1.1324 +
1.1325 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1326 + if test "x$test_cygdrive_prefix" = x; then
1.1327 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.1328 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1329 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1330 + # a path prefixed by /cygdrive for fixpath to work.
1.1331 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.1332 + fi
1.1333 + fi
1.1334 +
1.1335 +
1.1336 + if test "x$path" != "x$new_path"; then
1.1337 + MSVC_DLL="$new_path"
1.1338 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1339 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1340 + fi
1.1341 +
1.1342 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1343 +
1.1344 + path="$MSVC_DLL"
1.1345 + has_colon=`$ECHO $path | $GREP ^.:`
1.1346 + new_path="$path"
1.1347 + if test "x$has_colon" = x; then
1.1348 + # Not in mixed or Windows style, start by that.
1.1349 + new_path=`cmd //c echo $path`
1.1350 + fi
1.1351 +
1.1352 +
1.1353 + input_path="$new_path"
1.1354 + # Check if we need to convert this using DOS-style short mode. If the path
1.1355 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1356 + # take no chances and rewrite it.
1.1357 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1358 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1359 + if test "x$has_forbidden_chars" != x; then
1.1360 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1361 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1362 + fi
1.1363 +
1.1364 +
1.1365 + windows_path="$new_path"
1.1366 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1367 + unix_path=`$CYGPATH -u "$windows_path"`
1.1368 + new_path="$unix_path"
1.1369 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1370 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1371 + new_path="$unix_path"
1.1372 + fi
1.1373 +
1.1374 + if test "x$path" != "x$new_path"; then
1.1375 + MSVC_DLL="$new_path"
1.1376 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1377 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1378 + fi
1.1379 +
1.1380 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1381 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1382 +
1.1383 + else
1.1384 + # We're on a posix platform. Hooray! :)
1.1385 + path="$MSVC_DLL"
1.1386 + has_space=`$ECHO "$path" | $GREP " "`
1.1387 + if test "x$has_space" != x; then
1.1388 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1389 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1390 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1391 + fi
1.1392 +
1.1393 + # Use eval to expand a potential ~
1.1394 + eval path="$path"
1.1395 + if test ! -f "$path" && test ! -d "$path"; then
1.1396 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1397 + fi
1.1398 +
1.1399 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1400 + fi
1.1401 +
1.1402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.1403 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.1404 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.1405 @@ -48129,16 +48467,39 @@
1.1406 fi
1.1407 fi
1.1408
1.1409 - fi
1.1410 - fi
1.1411 + if test "x$MSVC_DLL" = x; then
1.1412 + as_fn_error $? "Could not find a proper $MSVCR_NAME as specified by devkit" "$LINENO" 5
1.1413 + fi
1.1414 + MSVCR_DLL="$MSVC_DLL"
1.1415 + else
1.1416 +
1.1417 + DLL_NAME="${MSVCR_NAME}"
1.1418 + MSVC_DLL=
1.1419
1.1420 if test "x$MSVC_DLL" = x; then
1.1421 - # Probe: Check in the Boot JDK directory.
1.1422 - POSSIBLE_MSVC_DLL="$BOOT_JDK/bin/$DLL_NAME"
1.1423 + # Probe: Using well-known location from Visual Studio 10.0
1.1424 + if test "x$VCINSTALLDIR" != x; then
1.1425 + CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.1426 +
1.1427 + windows_path="$CYGWIN_VC_INSTALL_DIR"
1.1428 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1429 + unix_path=`$CYGPATH -u "$windows_path"`
1.1430 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.1431 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1432 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1433 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.1434 + fi
1.1435 +
1.1436 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1437 + POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.1438 + else
1.1439 + POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.1440 + fi
1.1441 + $ECHO "POSSIBLE_MSVC_DLL $POSSIBLEMSVC_DLL"
1.1442
1.1443 DLL_NAME="$DLL_NAME"
1.1444 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1445 - METHOD="well-known location in Boot JDK"
1.1446 + METHOD="well-known location in VCINSTALLDIR"
1.1447 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.1448 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.1449 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.1450 @@ -48166,6 +48527,128 @@
1.1451 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1452 $as_echo "ok" >&6; }
1.1453 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1454 +
1.1455 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1456 +
1.1457 + # Input might be given as Windows format, start by converting to
1.1458 + # unix format.
1.1459 + path="$MSVC_DLL"
1.1460 + new_path=`$CYGPATH -u "$path"`
1.1461 +
1.1462 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1463 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1464 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1465 + # "foo.exe" is OK but "foo" is an error.
1.1466 + #
1.1467 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1468 + # It is also a way to make sure we got the proper file name for the real test later on.
1.1469 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1470 + if test "x$test_shortpath" = x; then
1.1471 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1472 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1473 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.1474 + fi
1.1475 +
1.1476 + # Call helper function which possibly converts this using DOS-style short mode.
1.1477 + # If so, the updated path is stored in $new_path.
1.1478 +
1.1479 + input_path="$new_path"
1.1480 + # Check if we need to convert this using DOS-style short mode. If the path
1.1481 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1482 + # take no chances and rewrite it.
1.1483 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1484 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1485 + if test "x$has_forbidden_chars" != x; then
1.1486 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1487 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1488 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1489 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1490 + # Going to short mode and back again did indeed matter. Since short mode is
1.1491 + # case insensitive, let's make it lowercase to improve readability.
1.1492 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1493 + # Now convert it back to Unix-style (cygpath)
1.1494 + input_path=`$CYGPATH -u "$shortmode_path"`
1.1495 + new_path="$input_path"
1.1496 + fi
1.1497 + fi
1.1498 +
1.1499 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1500 + if test "x$test_cygdrive_prefix" = x; then
1.1501 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.1502 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1503 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1504 + # a path prefixed by /cygdrive for fixpath to work.
1.1505 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.1506 + fi
1.1507 + fi
1.1508 +
1.1509 +
1.1510 + if test "x$path" != "x$new_path"; then
1.1511 + MSVC_DLL="$new_path"
1.1512 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1513 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1514 + fi
1.1515 +
1.1516 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1517 +
1.1518 + path="$MSVC_DLL"
1.1519 + has_colon=`$ECHO $path | $GREP ^.:`
1.1520 + new_path="$path"
1.1521 + if test "x$has_colon" = x; then
1.1522 + # Not in mixed or Windows style, start by that.
1.1523 + new_path=`cmd //c echo $path`
1.1524 + fi
1.1525 +
1.1526 +
1.1527 + input_path="$new_path"
1.1528 + # Check if we need to convert this using DOS-style short mode. If the path
1.1529 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1530 + # take no chances and rewrite it.
1.1531 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1532 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1533 + if test "x$has_forbidden_chars" != x; then
1.1534 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1535 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1536 + fi
1.1537 +
1.1538 +
1.1539 + windows_path="$new_path"
1.1540 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1541 + unix_path=`$CYGPATH -u "$windows_path"`
1.1542 + new_path="$unix_path"
1.1543 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1544 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1545 + new_path="$unix_path"
1.1546 + fi
1.1547 +
1.1548 + if test "x$path" != "x$new_path"; then
1.1549 + MSVC_DLL="$new_path"
1.1550 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1551 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1552 + fi
1.1553 +
1.1554 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1555 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1556 +
1.1557 + else
1.1558 + # We're on a posix platform. Hooray! :)
1.1559 + path="$MSVC_DLL"
1.1560 + has_space=`$ECHO "$path" | $GREP " "`
1.1561 + if test "x$has_space" != x; then
1.1562 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1563 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1564 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1565 + fi
1.1566 +
1.1567 + # Use eval to expand a potential ~
1.1568 + eval path="$path"
1.1569 + if test ! -f "$path" && test ! -d "$path"; then
1.1570 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1571 + fi
1.1572 +
1.1573 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1574 + fi
1.1575 +
1.1576 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.1577 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.1578 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.1579 @@ -48178,26 +48661,16 @@
1.1580 fi
1.1581 fi
1.1582
1.1583 + fi
1.1584 fi
1.1585
1.1586 if test "x$MSVC_DLL" = x; then
1.1587 - # Probe: Look in the Windows system32 directory
1.1588 - CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.1589 -
1.1590 - windows_path="$CYGWIN_SYSTEMROOT"
1.1591 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1592 - unix_path=`$CYGPATH -u "$windows_path"`
1.1593 - CYGWIN_SYSTEMROOT="$unix_path"
1.1594 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1595 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1596 - CYGWIN_SYSTEMROOT="$unix_path"
1.1597 - fi
1.1598 -
1.1599 - POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME"
1.1600 + # Probe: Check in the Boot JDK directory.
1.1601 + POSSIBLE_MSVC_DLL="$BOOT_JDK/bin/$DLL_NAME"
1.1602
1.1603 DLL_NAME="$DLL_NAME"
1.1604 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1605 - METHOD="well-known location in SYSTEMROOT"
1.1606 + METHOD="well-known location in Boot JDK"
1.1607 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.1608 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.1609 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.1610 @@ -48225,6 +48698,128 @@
1.1611 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1612 $as_echo "ok" >&6; }
1.1613 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1614 +
1.1615 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1616 +
1.1617 + # Input might be given as Windows format, start by converting to
1.1618 + # unix format.
1.1619 + path="$MSVC_DLL"
1.1620 + new_path=`$CYGPATH -u "$path"`
1.1621 +
1.1622 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1623 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1624 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1625 + # "foo.exe" is OK but "foo" is an error.
1.1626 + #
1.1627 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1628 + # It is also a way to make sure we got the proper file name for the real test later on.
1.1629 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1630 + if test "x$test_shortpath" = x; then
1.1631 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1632 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1633 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.1634 + fi
1.1635 +
1.1636 + # Call helper function which possibly converts this using DOS-style short mode.
1.1637 + # If so, the updated path is stored in $new_path.
1.1638 +
1.1639 + input_path="$new_path"
1.1640 + # Check if we need to convert this using DOS-style short mode. If the path
1.1641 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1642 + # take no chances and rewrite it.
1.1643 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1644 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1645 + if test "x$has_forbidden_chars" != x; then
1.1646 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1647 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1648 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1649 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1650 + # Going to short mode and back again did indeed matter. Since short mode is
1.1651 + # case insensitive, let's make it lowercase to improve readability.
1.1652 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1653 + # Now convert it back to Unix-style (cygpath)
1.1654 + input_path=`$CYGPATH -u "$shortmode_path"`
1.1655 + new_path="$input_path"
1.1656 + fi
1.1657 + fi
1.1658 +
1.1659 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1660 + if test "x$test_cygdrive_prefix" = x; then
1.1661 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.1662 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1663 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1664 + # a path prefixed by /cygdrive for fixpath to work.
1.1665 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.1666 + fi
1.1667 + fi
1.1668 +
1.1669 +
1.1670 + if test "x$path" != "x$new_path"; then
1.1671 + MSVC_DLL="$new_path"
1.1672 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1673 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1674 + fi
1.1675 +
1.1676 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1677 +
1.1678 + path="$MSVC_DLL"
1.1679 + has_colon=`$ECHO $path | $GREP ^.:`
1.1680 + new_path="$path"
1.1681 + if test "x$has_colon" = x; then
1.1682 + # Not in mixed or Windows style, start by that.
1.1683 + new_path=`cmd //c echo $path`
1.1684 + fi
1.1685 +
1.1686 +
1.1687 + input_path="$new_path"
1.1688 + # Check if we need to convert this using DOS-style short mode. If the path
1.1689 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1690 + # take no chances and rewrite it.
1.1691 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1692 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1693 + if test "x$has_forbidden_chars" != x; then
1.1694 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1695 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1696 + fi
1.1697 +
1.1698 +
1.1699 + windows_path="$new_path"
1.1700 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1701 + unix_path=`$CYGPATH -u "$windows_path"`
1.1702 + new_path="$unix_path"
1.1703 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1704 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1705 + new_path="$unix_path"
1.1706 + fi
1.1707 +
1.1708 + if test "x$path" != "x$new_path"; then
1.1709 + MSVC_DLL="$new_path"
1.1710 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1711 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1712 + fi
1.1713 +
1.1714 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1715 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1716 +
1.1717 + else
1.1718 + # We're on a posix platform. Hooray! :)
1.1719 + path="$MSVC_DLL"
1.1720 + has_space=`$ECHO "$path" | $GREP " "`
1.1721 + if test "x$has_space" != x; then
1.1722 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1723 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1724 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1725 + fi
1.1726 +
1.1727 + # Use eval to expand a potential ~
1.1728 + eval path="$path"
1.1729 + if test ! -f "$path" && test ! -d "$path"; then
1.1730 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1731 + fi
1.1732 +
1.1733 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1734 + fi
1.1735 +
1.1736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.1737 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.1738 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.1739 @@ -48240,30 +48835,23 @@
1.1740 fi
1.1741
1.1742 if test "x$MSVC_DLL" = x; then
1.1743 - # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.1744 - if test "x$VS100COMNTOOLS" != x; then
1.1745 - CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.1746 -
1.1747 - windows_path="$CYGWIN_VS_TOOLS_DIR"
1.1748 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1749 - unix_path=`$CYGPATH -u "$windows_path"`
1.1750 - CYGWIN_VS_TOOLS_DIR="$unix_path"
1.1751 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1752 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1753 - CYGWIN_VS_TOOLS_DIR="$unix_path"
1.1754 - fi
1.1755 -
1.1756 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1757 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.1758 - | $GREP -i /x64/ | $HEAD --lines 1`
1.1759 - else
1.1760 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.1761 - | $GREP -i /x86/ | $HEAD --lines 1`
1.1762 - fi
1.1763 + # Probe: Look in the Windows system32 directory
1.1764 + CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.1765 +
1.1766 + windows_path="$CYGWIN_SYSTEMROOT"
1.1767 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1768 + unix_path=`$CYGPATH -u "$windows_path"`
1.1769 + CYGWIN_SYSTEMROOT="$unix_path"
1.1770 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1771 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1772 + CYGWIN_SYSTEMROOT="$unix_path"
1.1773 + fi
1.1774 +
1.1775 + POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME"
1.1776
1.1777 DLL_NAME="$DLL_NAME"
1.1778 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1779 - METHOD="search of VS100COMNTOOLS"
1.1780 + METHOD="well-known location in SYSTEMROOT"
1.1781 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.1782 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.1783 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.1784 @@ -48291,6 +48879,128 @@
1.1785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1786 $as_echo "ok" >&6; }
1.1787 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1788 +
1.1789 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1790 +
1.1791 + # Input might be given as Windows format, start by converting to
1.1792 + # unix format.
1.1793 + path="$MSVC_DLL"
1.1794 + new_path=`$CYGPATH -u "$path"`
1.1795 +
1.1796 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1797 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1798 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1799 + # "foo.exe" is OK but "foo" is an error.
1.1800 + #
1.1801 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1802 + # It is also a way to make sure we got the proper file name for the real test later on.
1.1803 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1804 + if test "x$test_shortpath" = x; then
1.1805 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1806 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1807 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.1808 + fi
1.1809 +
1.1810 + # Call helper function which possibly converts this using DOS-style short mode.
1.1811 + # If so, the updated path is stored in $new_path.
1.1812 +
1.1813 + input_path="$new_path"
1.1814 + # Check if we need to convert this using DOS-style short mode. If the path
1.1815 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1816 + # take no chances and rewrite it.
1.1817 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1818 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1819 + if test "x$has_forbidden_chars" != x; then
1.1820 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1821 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.1822 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.1823 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.1824 + # Going to short mode and back again did indeed matter. Since short mode is
1.1825 + # case insensitive, let's make it lowercase to improve readability.
1.1826 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1827 + # Now convert it back to Unix-style (cygpath)
1.1828 + input_path=`$CYGPATH -u "$shortmode_path"`
1.1829 + new_path="$input_path"
1.1830 + fi
1.1831 + fi
1.1832 +
1.1833 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.1834 + if test "x$test_cygdrive_prefix" = x; then
1.1835 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.1836 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.1837 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.1838 + # a path prefixed by /cygdrive for fixpath to work.
1.1839 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.1840 + fi
1.1841 + fi
1.1842 +
1.1843 +
1.1844 + if test "x$path" != "x$new_path"; then
1.1845 + MSVC_DLL="$new_path"
1.1846 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1847 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1848 + fi
1.1849 +
1.1850 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1851 +
1.1852 + path="$MSVC_DLL"
1.1853 + has_colon=`$ECHO $path | $GREP ^.:`
1.1854 + new_path="$path"
1.1855 + if test "x$has_colon" = x; then
1.1856 + # Not in mixed or Windows style, start by that.
1.1857 + new_path=`cmd //c echo $path`
1.1858 + fi
1.1859 +
1.1860 +
1.1861 + input_path="$new_path"
1.1862 + # Check if we need to convert this using DOS-style short mode. If the path
1.1863 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1864 + # take no chances and rewrite it.
1.1865 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1866 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.1867 + if test "x$has_forbidden_chars" != x; then
1.1868 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.1869 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1870 + fi
1.1871 +
1.1872 +
1.1873 + windows_path="$new_path"
1.1874 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1875 + unix_path=`$CYGPATH -u "$windows_path"`
1.1876 + new_path="$unix_path"
1.1877 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1878 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1879 + new_path="$unix_path"
1.1880 + fi
1.1881 +
1.1882 + if test "x$path" != "x$new_path"; then
1.1883 + MSVC_DLL="$new_path"
1.1884 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.1885 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.1886 + fi
1.1887 +
1.1888 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.1889 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.1890 +
1.1891 + else
1.1892 + # We're on a posix platform. Hooray! :)
1.1893 + path="$MSVC_DLL"
1.1894 + has_space=`$ECHO "$path" | $GREP " "`
1.1895 + if test "x$has_space" != x; then
1.1896 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1897 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1898 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.1899 + fi
1.1900 +
1.1901 + # Use eval to expand a potential ~
1.1902 + eval path="$path"
1.1903 + if test ! -f "$path" && test ! -d "$path"; then
1.1904 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1905 + fi
1.1906 +
1.1907 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1908 + fi
1.1909 +
1.1910 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.1911 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.1912 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.1913 @@ -48303,30 +49013,33 @@
1.1914 fi
1.1915 fi
1.1916
1.1917 - fi
1.1918 fi
1.1919
1.1920 if test "x$MSVC_DLL" = x; then
1.1921 - # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.1922 - # (This was the original behaviour; kept since it might turn something up)
1.1923 - if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.1924 + # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.1925 + if test "x$VS100COMNTOOLS" != x; then
1.1926 + CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.1927 +
1.1928 + windows_path="$CYGWIN_VS_TOOLS_DIR"
1.1929 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1930 + unix_path=`$CYGPATH -u "$windows_path"`
1.1931 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.1932 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.1933 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.1934 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.1935 + fi
1.1936 +
1.1937 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.1938 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.1939 - | $GREP x64 | $HEAD --lines 1`
1.1940 - else
1.1941 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.1942 - | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.1943 - if test "x$POSSIBLE_MSVC_DLL" = x; then
1.1944 - # We're grasping at straws now...
1.1945 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.1946 - | $HEAD --lines 1`
1.1947 - fi
1.1948 - fi
1.1949 -
1.1950 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.1951 + | $GREP -i /x64/ | $HEAD --lines 1`
1.1952 + else
1.1953 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.1954 + | $GREP -i /x86/ | $HEAD --lines 1`
1.1955 + fi
1.1956
1.1957 DLL_NAME="$DLL_NAME"
1.1958 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1959 - METHOD="search of VCINSTALLDIR"
1.1960 + METHOD="search of VS100COMNTOOLS"
1.1961 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.1962 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.1963 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.1964 @@ -48354,6 +49067,128 @@
1.1965 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.1966 $as_echo "ok" >&6; }
1.1967 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.1968 +
1.1969 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1970 +
1.1971 + # Input might be given as Windows format, start by converting to
1.1972 + # unix format.
1.1973 + path="$MSVC_DLL"
1.1974 + new_path=`$CYGPATH -u "$path"`
1.1975 +
1.1976 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.1977 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.1978 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.1979 + # "foo.exe" is OK but "foo" is an error.
1.1980 + #
1.1981 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.1982 + # It is also a way to make sure we got the proper file name for the real test later on.
1.1983 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.1984 + if test "x$test_shortpath" = x; then
1.1985 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.1986 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.1987 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.1988 + fi
1.1989 +
1.1990 + # Call helper function which possibly converts this using DOS-style short mode.
1.1991 + # If so, the updated path is stored in $new_path.
1.1992 +
1.1993 + input_path="$new_path"
1.1994 + # Check if we need to convert this using DOS-style short mode. If the path
1.1995 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.1996 + # take no chances and rewrite it.
1.1997 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.1998 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.1999 + if test "x$has_forbidden_chars" != x; then
1.2000 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2001 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2002 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2003 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2004 + # Going to short mode and back again did indeed matter. Since short mode is
1.2005 + # case insensitive, let's make it lowercase to improve readability.
1.2006 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2007 + # Now convert it back to Unix-style (cygpath)
1.2008 + input_path=`$CYGPATH -u "$shortmode_path"`
1.2009 + new_path="$input_path"
1.2010 + fi
1.2011 + fi
1.2012 +
1.2013 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2014 + if test "x$test_cygdrive_prefix" = x; then
1.2015 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.2016 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.2017 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2018 + # a path prefixed by /cygdrive for fixpath to work.
1.2019 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.2020 + fi
1.2021 + fi
1.2022 +
1.2023 +
1.2024 + if test "x$path" != "x$new_path"; then
1.2025 + MSVC_DLL="$new_path"
1.2026 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2027 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2028 + fi
1.2029 +
1.2030 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2031 +
1.2032 + path="$MSVC_DLL"
1.2033 + has_colon=`$ECHO $path | $GREP ^.:`
1.2034 + new_path="$path"
1.2035 + if test "x$has_colon" = x; then
1.2036 + # Not in mixed or Windows style, start by that.
1.2037 + new_path=`cmd //c echo $path`
1.2038 + fi
1.2039 +
1.2040 +
1.2041 + input_path="$new_path"
1.2042 + # Check if we need to convert this using DOS-style short mode. If the path
1.2043 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2044 + # take no chances and rewrite it.
1.2045 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2046 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2047 + if test "x$has_forbidden_chars" != x; then
1.2048 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2049 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2050 + fi
1.2051 +
1.2052 +
1.2053 + windows_path="$new_path"
1.2054 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2055 + unix_path=`$CYGPATH -u "$windows_path"`
1.2056 + new_path="$unix_path"
1.2057 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2058 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2059 + new_path="$unix_path"
1.2060 + fi
1.2061 +
1.2062 + if test "x$path" != "x$new_path"; then
1.2063 + MSVC_DLL="$new_path"
1.2064 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2065 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2066 + fi
1.2067 +
1.2068 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2069 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2070 +
1.2071 + else
1.2072 + # We're on a posix platform. Hooray! :)
1.2073 + path="$MSVC_DLL"
1.2074 + has_space=`$ECHO "$path" | $GREP " "`
1.2075 + if test "x$has_space" != x; then
1.2076 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2077 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2078 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.2079 + fi
1.2080 +
1.2081 + # Use eval to expand a potential ~
1.2082 + eval path="$path"
1.2083 + if test ! -f "$path" && test ! -d "$path"; then
1.2084 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.2085 + fi
1.2086 +
1.2087 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.2088 + fi
1.2089 +
1.2090 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2091 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.2092 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.2093 @@ -48370,155 +49205,26 @@
1.2094 fi
1.2095
1.2096 if test "x$MSVC_DLL" = x; then
1.2097 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2098 -$as_echo_n "checking for $DLL_NAME... " >&6; }
1.2099 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2100 -$as_echo "no" >&6; }
1.2101 - as_fn_error $? "Could not find $DLL_NAME. Please specify using --with-msvcr-dll." "$LINENO" 5
1.2102 - fi
1.2103 -
1.2104 - MSVCR_DLL=$MSVC_DLL
1.2105 -
1.2106 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2107 -
1.2108 - # Input might be given as Windows format, start by converting to
1.2109 - # unix format.
1.2110 - path="$MSVCR_DLL"
1.2111 - new_path=`$CYGPATH -u "$path"`
1.2112 -
1.2113 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2114 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2115 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2116 - # "foo.exe" is OK but "foo" is an error.
1.2117 - #
1.2118 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.2119 - # It is also a way to make sure we got the proper file name for the real test later on.
1.2120 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2121 - if test "x$test_shortpath" = x; then
1.2122 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
1.2123 -$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2124 - as_fn_error $? "Cannot locate the the path of MSVCR_DLL" "$LINENO" 5
1.2125 - fi
1.2126 -
1.2127 - # Call helper function which possibly converts this using DOS-style short mode.
1.2128 - # If so, the updated path is stored in $new_path.
1.2129 -
1.2130 - input_path="$new_path"
1.2131 - # Check if we need to convert this using DOS-style short mode. If the path
1.2132 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2133 - # take no chances and rewrite it.
1.2134 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.2135 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2136 - if test "x$has_forbidden_chars" != x; then
1.2137 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2138 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2139 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2140 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2141 - # Going to short mode and back again did indeed matter. Since short mode is
1.2142 - # case insensitive, let's make it lowercase to improve readability.
1.2143 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2144 - # Now convert it back to Unix-stile (cygpath)
1.2145 - input_path=`$CYGPATH -u "$shortmode_path"`
1.2146 - new_path="$input_path"
1.2147 - fi
1.2148 - fi
1.2149 -
1.2150 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2151 - if test "x$test_cygdrive_prefix" = x; then
1.2152 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.2153 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.2154 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2155 - # a path prefixed by /cygdrive for fixpath to work.
1.2156 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.2157 - fi
1.2158 - fi
1.2159 -
1.2160 -
1.2161 - if test "x$path" != "x$new_path"; then
1.2162 - MSVCR_DLL="$new_path"
1.2163 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
1.2164 -$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
1.2165 - fi
1.2166 -
1.2167 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2168 -
1.2169 - path="$MSVCR_DLL"
1.2170 - has_colon=`$ECHO $path | $GREP ^.:`
1.2171 - new_path="$path"
1.2172 - if test "x$has_colon" = x; then
1.2173 - # Not in mixed or Windows style, start by that.
1.2174 - new_path=`cmd //c echo $path`
1.2175 - fi
1.2176 -
1.2177 -
1.2178 - input_path="$new_path"
1.2179 - # Check if we need to convert this using DOS-style short mode. If the path
1.2180 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2181 - # take no chances and rewrite it.
1.2182 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.2183 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2184 - if test "x$has_forbidden_chars" != x; then
1.2185 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2186 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2187 - fi
1.2188 -
1.2189 -
1.2190 - windows_path="$new_path"
1.2191 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2192 - unix_path=`$CYGPATH -u "$windows_path"`
1.2193 - new_path="$unix_path"
1.2194 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2195 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2196 - new_path="$unix_path"
1.2197 - fi
1.2198 -
1.2199 - if test "x$path" != "x$new_path"; then
1.2200 - MSVCR_DLL="$new_path"
1.2201 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCR_DLL to \"$new_path\"" >&5
1.2202 -$as_echo "$as_me: Rewriting MSVCR_DLL to \"$new_path\"" >&6;}
1.2203 - fi
1.2204 -
1.2205 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2206 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2207 -
1.2208 - else
1.2209 - # We're on a posix platform. Hooray! :)
1.2210 - path="$MSVCR_DLL"
1.2211 - has_space=`$ECHO "$path" | $GREP " "`
1.2212 - if test "x$has_space" != x; then
1.2213 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5
1.2214 -$as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2215 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.2216 - fi
1.2217 -
1.2218 - # Use eval to expand a potential ~
1.2219 - eval path="$path"
1.2220 - if test ! -f "$path" && test ! -d "$path"; then
1.2221 - as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.2222 - fi
1.2223 -
1.2224 - MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
1.2225 - fi
1.2226 -
1.2227 - MSVCR_DLL=$MSVCR_DLL
1.2228 -
1.2229 -
1.2230 - fi
1.2231 -
1.2232 -
1.2233 -# Check whether --with-msvcp-dll was given.
1.2234 -if test "${with_msvcp_dll+set}" = set; then :
1.2235 - withval=$with_msvcp_dll;
1.2236 -fi
1.2237 -
1.2238 -
1.2239 - if test "x$MSVCP_NAME" != "x"; then
1.2240 - if test "x$with_msvcp_dll" != x; then
1.2241 - # If given explicitely by user, do not probe. If not present, fail directly.
1.2242 + # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.2243 + # (This was the original behaviour; kept since it might turn something up)
1.2244 + if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.2245 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2246 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.2247 + | $GREP x64 | $HEAD --lines 1`
1.2248 + else
1.2249 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.2250 + | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.2251 + if test "x$POSSIBLE_MSVC_DLL" = x; then
1.2252 + # We're grasping at straws now...
1.2253 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.2254 + | $HEAD --lines 1`
1.2255 + fi
1.2256 + fi
1.2257 +
1.2258
1.2259 DLL_NAME="$DLL_NAME"
1.2260 - POSSIBLE_MSVC_DLL="$with_msvcp_dll"
1.2261 - METHOD="--with-msvcp-dll"
1.2262 + POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2263 + METHOD="search of VCINSTALLDIR"
1.2264 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.2265 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.2266 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.2267 @@ -48546,6 +49252,128 @@
1.2268 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.2269 $as_echo "ok" >&6; }
1.2270 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2271 +
1.2272 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2273 +
1.2274 + # Input might be given as Windows format, start by converting to
1.2275 + # unix format.
1.2276 + path="$MSVC_DLL"
1.2277 + new_path=`$CYGPATH -u "$path"`
1.2278 +
1.2279 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2280 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2281 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2282 + # "foo.exe" is OK but "foo" is an error.
1.2283 + #
1.2284 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.2285 + # It is also a way to make sure we got the proper file name for the real test later on.
1.2286 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2287 + if test "x$test_shortpath" = x; then
1.2288 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2289 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2290 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.2291 + fi
1.2292 +
1.2293 + # Call helper function which possibly converts this using DOS-style short mode.
1.2294 + # If so, the updated path is stored in $new_path.
1.2295 +
1.2296 + input_path="$new_path"
1.2297 + # Check if we need to convert this using DOS-style short mode. If the path
1.2298 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2299 + # take no chances and rewrite it.
1.2300 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2301 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2302 + if test "x$has_forbidden_chars" != x; then
1.2303 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2304 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2305 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2306 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2307 + # Going to short mode and back again did indeed matter. Since short mode is
1.2308 + # case insensitive, let's make it lowercase to improve readability.
1.2309 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2310 + # Now convert it back to Unix-style (cygpath)
1.2311 + input_path=`$CYGPATH -u "$shortmode_path"`
1.2312 + new_path="$input_path"
1.2313 + fi
1.2314 + fi
1.2315 +
1.2316 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2317 + if test "x$test_cygdrive_prefix" = x; then
1.2318 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.2319 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.2320 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2321 + # a path prefixed by /cygdrive for fixpath to work.
1.2322 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.2323 + fi
1.2324 + fi
1.2325 +
1.2326 +
1.2327 + if test "x$path" != "x$new_path"; then
1.2328 + MSVC_DLL="$new_path"
1.2329 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2330 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2331 + fi
1.2332 +
1.2333 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2334 +
1.2335 + path="$MSVC_DLL"
1.2336 + has_colon=`$ECHO $path | $GREP ^.:`
1.2337 + new_path="$path"
1.2338 + if test "x$has_colon" = x; then
1.2339 + # Not in mixed or Windows style, start by that.
1.2340 + new_path=`cmd //c echo $path`
1.2341 + fi
1.2342 +
1.2343 +
1.2344 + input_path="$new_path"
1.2345 + # Check if we need to convert this using DOS-style short mode. If the path
1.2346 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2347 + # take no chances and rewrite it.
1.2348 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2349 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2350 + if test "x$has_forbidden_chars" != x; then
1.2351 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2352 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2353 + fi
1.2354 +
1.2355 +
1.2356 + windows_path="$new_path"
1.2357 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2358 + unix_path=`$CYGPATH -u "$windows_path"`
1.2359 + new_path="$unix_path"
1.2360 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2361 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2362 + new_path="$unix_path"
1.2363 + fi
1.2364 +
1.2365 + if test "x$path" != "x$new_path"; then
1.2366 + MSVC_DLL="$new_path"
1.2367 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2368 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2369 + fi
1.2370 +
1.2371 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2372 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2373 +
1.2374 + else
1.2375 + # We're on a posix platform. Hooray! :)
1.2376 + path="$MSVC_DLL"
1.2377 + has_space=`$ECHO "$path" | $GREP " "`
1.2378 + if test "x$has_space" != x; then
1.2379 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2380 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2381 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.2382 + fi
1.2383 +
1.2384 + # Use eval to expand a potential ~
1.2385 + eval path="$path"
1.2386 + if test ! -f "$path" && test ! -d "$path"; then
1.2387 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.2388 + fi
1.2389 +
1.2390 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.2391 + fi
1.2392 +
1.2393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2394 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.2395 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.2396 @@ -48558,39 +49386,35 @@
1.2397 fi
1.2398 fi
1.2399
1.2400 - if test "x$MSVC_DLL" = x; then
1.2401 - as_fn_error $? "Could not find a proper $MSVCP_NAME as specified by --with-msvcp-dll" "$LINENO" 5
1.2402 - fi
1.2403 - else
1.2404 -
1.2405 - VAR_NAME="MSVCP_DLL"
1.2406 - DLL_NAME="${MSVCP_NAME}"
1.2407 - MSVC_DLL=
1.2408 + fi
1.2409 + fi
1.2410
1.2411 if test "x$MSVC_DLL" = x; then
1.2412 - # Probe: Using well-known location from Visual Studio 10.0
1.2413 - if test "x$VCINSTALLDIR" != x; then
1.2414 - CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.2415 -
1.2416 - windows_path="$CYGWIN_VC_INSTALL_DIR"
1.2417 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2418 - unix_path=`$CYGPATH -u "$windows_path"`
1.2419 - CYGWIN_VC_INSTALL_DIR="$unix_path"
1.2420 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2421 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2422 - CYGWIN_VC_INSTALL_DIR="$unix_path"
1.2423 - fi
1.2424 -
1.2425 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2426 - POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.2427 - else
1.2428 - POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.2429 - fi
1.2430 - $ECHO "POSSIBLE_MSVC_DLL $POSSIBLEMSVC_DLL"
1.2431 -
1.2432 - DLL_NAME="$DLL_NAME"
1.2433 - POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2434 - METHOD="well-known location in VCINSTALLDIR"
1.2435 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2436 +$as_echo_n "checking for $DLL_NAME... " >&6; }
1.2437 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.2438 +$as_echo "no" >&6; }
1.2439 + as_fn_error $? "Could not find $DLL_NAME. Please specify using --with-msvcr-dll." "$LINENO" 5
1.2440 + fi
1.2441 +
1.2442 + MSVCR_DLL="$MSVC_DLL"
1.2443 + fi
1.2444 +
1.2445 +
1.2446 +
1.2447 +# Check whether --with-msvcp-dll was given.
1.2448 +if test "${with_msvcp_dll+set}" = set; then :
1.2449 + withval=$with_msvcp_dll;
1.2450 +fi
1.2451 +
1.2452 +
1.2453 + if test "x$MSVCP_NAME" != "x"; then
1.2454 + if test "x$with_msvcp_dll" != x; then
1.2455 + # If given explicitely by user, do not probe. If not present, fail directly.
1.2456 +
1.2457 + DLL_NAME="$MSVCP_NAME"
1.2458 + POSSIBLE_MSVC_DLL="$with_msvcp_dll"
1.2459 + METHOD="--with-msvcp-dll"
1.2460 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.2461 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.2462 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.2463 @@ -48618,6 +49442,128 @@
1.2464 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.2465 $as_echo "ok" >&6; }
1.2466 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2467 +
1.2468 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2469 +
1.2470 + # Input might be given as Windows format, start by converting to
1.2471 + # unix format.
1.2472 + path="$MSVC_DLL"
1.2473 + new_path=`$CYGPATH -u "$path"`
1.2474 +
1.2475 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2476 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2477 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2478 + # "foo.exe" is OK but "foo" is an error.
1.2479 + #
1.2480 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.2481 + # It is also a way to make sure we got the proper file name for the real test later on.
1.2482 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2483 + if test "x$test_shortpath" = x; then
1.2484 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2485 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2486 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.2487 + fi
1.2488 +
1.2489 + # Call helper function which possibly converts this using DOS-style short mode.
1.2490 + # If so, the updated path is stored in $new_path.
1.2491 +
1.2492 + input_path="$new_path"
1.2493 + # Check if we need to convert this using DOS-style short mode. If the path
1.2494 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2495 + # take no chances and rewrite it.
1.2496 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2497 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2498 + if test "x$has_forbidden_chars" != x; then
1.2499 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2500 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2501 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2502 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2503 + # Going to short mode and back again did indeed matter. Since short mode is
1.2504 + # case insensitive, let's make it lowercase to improve readability.
1.2505 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2506 + # Now convert it back to Unix-style (cygpath)
1.2507 + input_path=`$CYGPATH -u "$shortmode_path"`
1.2508 + new_path="$input_path"
1.2509 + fi
1.2510 + fi
1.2511 +
1.2512 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2513 + if test "x$test_cygdrive_prefix" = x; then
1.2514 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.2515 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.2516 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2517 + # a path prefixed by /cygdrive for fixpath to work.
1.2518 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.2519 + fi
1.2520 + fi
1.2521 +
1.2522 +
1.2523 + if test "x$path" != "x$new_path"; then
1.2524 + MSVC_DLL="$new_path"
1.2525 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2526 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2527 + fi
1.2528 +
1.2529 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2530 +
1.2531 + path="$MSVC_DLL"
1.2532 + has_colon=`$ECHO $path | $GREP ^.:`
1.2533 + new_path="$path"
1.2534 + if test "x$has_colon" = x; then
1.2535 + # Not in mixed or Windows style, start by that.
1.2536 + new_path=`cmd //c echo $path`
1.2537 + fi
1.2538 +
1.2539 +
1.2540 + input_path="$new_path"
1.2541 + # Check if we need to convert this using DOS-style short mode. If the path
1.2542 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2543 + # take no chances and rewrite it.
1.2544 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2545 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2546 + if test "x$has_forbidden_chars" != x; then
1.2547 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2548 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2549 + fi
1.2550 +
1.2551 +
1.2552 + windows_path="$new_path"
1.2553 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2554 + unix_path=`$CYGPATH -u "$windows_path"`
1.2555 + new_path="$unix_path"
1.2556 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2557 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2558 + new_path="$unix_path"
1.2559 + fi
1.2560 +
1.2561 + if test "x$path" != "x$new_path"; then
1.2562 + MSVC_DLL="$new_path"
1.2563 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2564 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2565 + fi
1.2566 +
1.2567 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2568 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2569 +
1.2570 + else
1.2571 + # We're on a posix platform. Hooray! :)
1.2572 + path="$MSVC_DLL"
1.2573 + has_space=`$ECHO "$path" | $GREP " "`
1.2574 + if test "x$has_space" != x; then
1.2575 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2576 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2577 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.2578 + fi
1.2579 +
1.2580 + # Use eval to expand a potential ~
1.2581 + eval path="$path"
1.2582 + if test ! -f "$path" && test ! -d "$path"; then
1.2583 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.2584 + fi
1.2585 +
1.2586 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.2587 + fi
1.2588 +
1.2589 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2590 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.2591 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.2592 @@ -48630,16 +49576,15 @@
1.2593 fi
1.2594 fi
1.2595
1.2596 - fi
1.2597 - fi
1.2598 -
1.2599 - if test "x$MSVC_DLL" = x; then
1.2600 - # Probe: Check in the Boot JDK directory.
1.2601 - POSSIBLE_MSVC_DLL="$BOOT_JDK/bin/$DLL_NAME"
1.2602 -
1.2603 - DLL_NAME="$DLL_NAME"
1.2604 - POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2605 - METHOD="well-known location in Boot JDK"
1.2606 + if test "x$MSVC_DLL" = x; then
1.2607 + as_fn_error $? "Could not find a proper $MSVCP_NAME as specified by --with-msvcp-dll" "$LINENO" 5
1.2608 + fi
1.2609 + MSVCP_DLL="$MSVC_DLL"
1.2610 + elif test "x$DEVKIT_MSVCP_DLL" != x; then
1.2611 +
1.2612 + DLL_NAME="$MSVCP_NAME"
1.2613 + POSSIBLE_MSVC_DLL="$DEVKIT_MSVCP_DLL"
1.2614 + METHOD="devkit"
1.2615 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.2616 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.2617 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.2618 @@ -48667,6 +49612,128 @@
1.2619 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.2620 $as_echo "ok" >&6; }
1.2621 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2622 +
1.2623 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2624 +
1.2625 + # Input might be given as Windows format, start by converting to
1.2626 + # unix format.
1.2627 + path="$MSVC_DLL"
1.2628 + new_path=`$CYGPATH -u "$path"`
1.2629 +
1.2630 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2631 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2632 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2633 + # "foo.exe" is OK but "foo" is an error.
1.2634 + #
1.2635 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.2636 + # It is also a way to make sure we got the proper file name for the real test later on.
1.2637 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2638 + if test "x$test_shortpath" = x; then
1.2639 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2640 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2641 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.2642 + fi
1.2643 +
1.2644 + # Call helper function which possibly converts this using DOS-style short mode.
1.2645 + # If so, the updated path is stored in $new_path.
1.2646 +
1.2647 + input_path="$new_path"
1.2648 + # Check if we need to convert this using DOS-style short mode. If the path
1.2649 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2650 + # take no chances and rewrite it.
1.2651 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2652 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2653 + if test "x$has_forbidden_chars" != x; then
1.2654 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2655 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2656 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2657 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2658 + # Going to short mode and back again did indeed matter. Since short mode is
1.2659 + # case insensitive, let's make it lowercase to improve readability.
1.2660 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2661 + # Now convert it back to Unix-style (cygpath)
1.2662 + input_path=`$CYGPATH -u "$shortmode_path"`
1.2663 + new_path="$input_path"
1.2664 + fi
1.2665 + fi
1.2666 +
1.2667 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2668 + if test "x$test_cygdrive_prefix" = x; then
1.2669 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.2670 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.2671 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2672 + # a path prefixed by /cygdrive for fixpath to work.
1.2673 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.2674 + fi
1.2675 + fi
1.2676 +
1.2677 +
1.2678 + if test "x$path" != "x$new_path"; then
1.2679 + MSVC_DLL="$new_path"
1.2680 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2681 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2682 + fi
1.2683 +
1.2684 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2685 +
1.2686 + path="$MSVC_DLL"
1.2687 + has_colon=`$ECHO $path | $GREP ^.:`
1.2688 + new_path="$path"
1.2689 + if test "x$has_colon" = x; then
1.2690 + # Not in mixed or Windows style, start by that.
1.2691 + new_path=`cmd //c echo $path`
1.2692 + fi
1.2693 +
1.2694 +
1.2695 + input_path="$new_path"
1.2696 + # Check if we need to convert this using DOS-style short mode. If the path
1.2697 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2698 + # take no chances and rewrite it.
1.2699 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2700 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2701 + if test "x$has_forbidden_chars" != x; then
1.2702 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2703 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2704 + fi
1.2705 +
1.2706 +
1.2707 + windows_path="$new_path"
1.2708 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2709 + unix_path=`$CYGPATH -u "$windows_path"`
1.2710 + new_path="$unix_path"
1.2711 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2712 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2713 + new_path="$unix_path"
1.2714 + fi
1.2715 +
1.2716 + if test "x$path" != "x$new_path"; then
1.2717 + MSVC_DLL="$new_path"
1.2718 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2719 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2720 + fi
1.2721 +
1.2722 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2723 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2724 +
1.2725 + else
1.2726 + # We're on a posix platform. Hooray! :)
1.2727 + path="$MSVC_DLL"
1.2728 + has_space=`$ECHO "$path" | $GREP " "`
1.2729 + if test "x$has_space" != x; then
1.2730 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2731 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2732 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.2733 + fi
1.2734 +
1.2735 + # Use eval to expand a potential ~
1.2736 + eval path="$path"
1.2737 + if test ! -f "$path" && test ! -d "$path"; then
1.2738 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.2739 + fi
1.2740 +
1.2741 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.2742 + fi
1.2743 +
1.2744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2745 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.2746 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.2747 @@ -48679,26 +49746,39 @@
1.2748 fi
1.2749 fi
1.2750
1.2751 - fi
1.2752 + if test "x$MSVC_DLL" = x; then
1.2753 + as_fn_error $? "Could not find a proper $MSVCP_NAME as specified by devkit" "$LINENO" 5
1.2754 + fi
1.2755 + MSVCP_DLL="$MSVC_DLL"
1.2756 + else
1.2757 +
1.2758 + DLL_NAME="${MSVCP_NAME}"
1.2759 + MSVC_DLL=
1.2760
1.2761 if test "x$MSVC_DLL" = x; then
1.2762 - # Probe: Look in the Windows system32 directory
1.2763 - CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.2764 -
1.2765 - windows_path="$CYGWIN_SYSTEMROOT"
1.2766 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2767 - unix_path=`$CYGPATH -u "$windows_path"`
1.2768 - CYGWIN_SYSTEMROOT="$unix_path"
1.2769 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2770 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2771 - CYGWIN_SYSTEMROOT="$unix_path"
1.2772 - fi
1.2773 -
1.2774 - POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME"
1.2775 + # Probe: Using well-known location from Visual Studio 10.0
1.2776 + if test "x$VCINSTALLDIR" != x; then
1.2777 + CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
1.2778 +
1.2779 + windows_path="$CYGWIN_VC_INSTALL_DIR"
1.2780 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2781 + unix_path=`$CYGPATH -u "$windows_path"`
1.2782 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.2783 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2784 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2785 + CYGWIN_VC_INSTALL_DIR="$unix_path"
1.2786 + fi
1.2787 +
1.2788 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2789 + POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.2790 + else
1.2791 + POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
1.2792 + fi
1.2793 + $ECHO "POSSIBLE_MSVC_DLL $POSSIBLEMSVC_DLL"
1.2794
1.2795 DLL_NAME="$DLL_NAME"
1.2796 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2797 - METHOD="well-known location in SYSTEMROOT"
1.2798 + METHOD="well-known location in VCINSTALLDIR"
1.2799 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.2800 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.2801 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.2802 @@ -48726,6 +49806,128 @@
1.2803 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.2804 $as_echo "ok" >&6; }
1.2805 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2806 +
1.2807 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2808 +
1.2809 + # Input might be given as Windows format, start by converting to
1.2810 + # unix format.
1.2811 + path="$MSVC_DLL"
1.2812 + new_path=`$CYGPATH -u "$path"`
1.2813 +
1.2814 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2815 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2816 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2817 + # "foo.exe" is OK but "foo" is an error.
1.2818 + #
1.2819 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.2820 + # It is also a way to make sure we got the proper file name for the real test later on.
1.2821 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2822 + if test "x$test_shortpath" = x; then
1.2823 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2824 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2825 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.2826 + fi
1.2827 +
1.2828 + # Call helper function which possibly converts this using DOS-style short mode.
1.2829 + # If so, the updated path is stored in $new_path.
1.2830 +
1.2831 + input_path="$new_path"
1.2832 + # Check if we need to convert this using DOS-style short mode. If the path
1.2833 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2834 + # take no chances and rewrite it.
1.2835 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2836 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.2837 + if test "x$has_forbidden_chars" != x; then
1.2838 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2839 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.2840 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.2841 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.2842 + # Going to short mode and back again did indeed matter. Since short mode is
1.2843 + # case insensitive, let's make it lowercase to improve readability.
1.2844 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2845 + # Now convert it back to Unix-style (cygpath)
1.2846 + input_path=`$CYGPATH -u "$shortmode_path"`
1.2847 + new_path="$input_path"
1.2848 + fi
1.2849 + fi
1.2850 +
1.2851 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.2852 + if test "x$test_cygdrive_prefix" = x; then
1.2853 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.2854 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.2855 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.2856 + # a path prefixed by /cygdrive for fixpath to work.
1.2857 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.2858 + fi
1.2859 + fi
1.2860 +
1.2861 +
1.2862 + if test "x$path" != "x$new_path"; then
1.2863 + MSVC_DLL="$new_path"
1.2864 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2865 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2866 + fi
1.2867 +
1.2868 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2869 +
1.2870 + path="$MSVC_DLL"
1.2871 + has_colon=`$ECHO $path | $GREP ^.:`
1.2872 + new_path="$path"
1.2873 + if test "x$has_colon" = x; then
1.2874 + # Not in mixed or Windows style, start by that.
1.2875 + new_path=`cmd //c echo $path`
1.2876 + fi
1.2877 +
1.2878 +
1.2879 + input_path="$new_path"
1.2880 + # Check if we need to convert this using DOS-style short mode. If the path
1.2881 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.2882 + # take no chances and rewrite it.
1.2883 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.2884 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.2885 + if test "x$has_forbidden_chars" != x; then
1.2886 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.2887 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.2888 + fi
1.2889 +
1.2890 +
1.2891 + windows_path="$new_path"
1.2892 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2893 + unix_path=`$CYGPATH -u "$windows_path"`
1.2894 + new_path="$unix_path"
1.2895 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2896 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2897 + new_path="$unix_path"
1.2898 + fi
1.2899 +
1.2900 + if test "x$path" != "x$new_path"; then
1.2901 + MSVC_DLL="$new_path"
1.2902 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.2903 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.2904 + fi
1.2905 +
1.2906 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.2907 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.2908 +
1.2909 + else
1.2910 + # We're on a posix platform. Hooray! :)
1.2911 + path="$MSVC_DLL"
1.2912 + has_space=`$ECHO "$path" | $GREP " "`
1.2913 + if test "x$has_space" != x; then
1.2914 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2915 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2916 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.2917 + fi
1.2918 +
1.2919 + # Use eval to expand a potential ~
1.2920 + eval path="$path"
1.2921 + if test ! -f "$path" && test ! -d "$path"; then
1.2922 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.2923 + fi
1.2924 +
1.2925 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.2926 + fi
1.2927 +
1.2928 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.2929 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.2930 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.2931 @@ -48738,33 +49940,16 @@
1.2932 fi
1.2933 fi
1.2934
1.2935 + fi
1.2936 fi
1.2937
1.2938 if test "x$MSVC_DLL" = x; then
1.2939 - # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.2940 - if test "x$VS100COMNTOOLS" != x; then
1.2941 - CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.2942 -
1.2943 - windows_path="$CYGWIN_VS_TOOLS_DIR"
1.2944 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2945 - unix_path=`$CYGPATH -u "$windows_path"`
1.2946 - CYGWIN_VS_TOOLS_DIR="$unix_path"
1.2947 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.2948 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.2949 - CYGWIN_VS_TOOLS_DIR="$unix_path"
1.2950 - fi
1.2951 -
1.2952 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.2953 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.2954 - | $GREP -i /x64/ | $HEAD --lines 1`
1.2955 - else
1.2956 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.2957 - | $GREP -i /x86/ | $HEAD --lines 1`
1.2958 - fi
1.2959 + # Probe: Check in the Boot JDK directory.
1.2960 + POSSIBLE_MSVC_DLL="$BOOT_JDK/bin/$DLL_NAME"
1.2961
1.2962 DLL_NAME="$DLL_NAME"
1.2963 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2964 - METHOD="search of VS100COMNTOOLS"
1.2965 + METHOD="well-known location in Boot JDK"
1.2966 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.2967 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.2968 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.2969 @@ -48792,6 +49977,128 @@
1.2970 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.2971 $as_echo "ok" >&6; }
1.2972 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.2973 +
1.2974 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.2975 +
1.2976 + # Input might be given as Windows format, start by converting to
1.2977 + # unix format.
1.2978 + path="$MSVC_DLL"
1.2979 + new_path=`$CYGPATH -u "$path"`
1.2980 +
1.2981 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.2982 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.2983 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.2984 + # "foo.exe" is OK but "foo" is an error.
1.2985 + #
1.2986 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.2987 + # It is also a way to make sure we got the proper file name for the real test later on.
1.2988 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.2989 + if test "x$test_shortpath" = x; then
1.2990 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.2991 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.2992 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.2993 + fi
1.2994 +
1.2995 + # Call helper function which possibly converts this using DOS-style short mode.
1.2996 + # If so, the updated path is stored in $new_path.
1.2997 +
1.2998 + input_path="$new_path"
1.2999 + # Check if we need to convert this using DOS-style short mode. If the path
1.3000 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3001 + # take no chances and rewrite it.
1.3002 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3003 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.3004 + if test "x$has_forbidden_chars" != x; then
1.3005 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3006 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.3007 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.3008 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.3009 + # Going to short mode and back again did indeed matter. Since short mode is
1.3010 + # case insensitive, let's make it lowercase to improve readability.
1.3011 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3012 + # Now convert it back to Unix-style (cygpath)
1.3013 + input_path=`$CYGPATH -u "$shortmode_path"`
1.3014 + new_path="$input_path"
1.3015 + fi
1.3016 + fi
1.3017 +
1.3018 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.3019 + if test "x$test_cygdrive_prefix" = x; then
1.3020 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.3021 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.3022 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.3023 + # a path prefixed by /cygdrive for fixpath to work.
1.3024 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.3025 + fi
1.3026 + fi
1.3027 +
1.3028 +
1.3029 + if test "x$path" != "x$new_path"; then
1.3030 + MSVC_DLL="$new_path"
1.3031 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3032 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3033 + fi
1.3034 +
1.3035 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3036 +
1.3037 + path="$MSVC_DLL"
1.3038 + has_colon=`$ECHO $path | $GREP ^.:`
1.3039 + new_path="$path"
1.3040 + if test "x$has_colon" = x; then
1.3041 + # Not in mixed or Windows style, start by that.
1.3042 + new_path=`cmd //c echo $path`
1.3043 + fi
1.3044 +
1.3045 +
1.3046 + input_path="$new_path"
1.3047 + # Check if we need to convert this using DOS-style short mode. If the path
1.3048 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3049 + # take no chances and rewrite it.
1.3050 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3051 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.3052 + if test "x$has_forbidden_chars" != x; then
1.3053 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3054 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3055 + fi
1.3056 +
1.3057 +
1.3058 + windows_path="$new_path"
1.3059 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3060 + unix_path=`$CYGPATH -u "$windows_path"`
1.3061 + new_path="$unix_path"
1.3062 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3063 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3064 + new_path="$unix_path"
1.3065 + fi
1.3066 +
1.3067 + if test "x$path" != "x$new_path"; then
1.3068 + MSVC_DLL="$new_path"
1.3069 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3070 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3071 + fi
1.3072 +
1.3073 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.3074 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.3075 +
1.3076 + else
1.3077 + # We're on a posix platform. Hooray! :)
1.3078 + path="$MSVC_DLL"
1.3079 + has_space=`$ECHO "$path" | $GREP " "`
1.3080 + if test "x$has_space" != x; then
1.3081 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3082 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3083 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.3084 + fi
1.3085 +
1.3086 + # Use eval to expand a potential ~
1.3087 + eval path="$path"
1.3088 + if test ! -f "$path" && test ! -d "$path"; then
1.3089 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.3090 + fi
1.3091 +
1.3092 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.3093 + fi
1.3094 +
1.3095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.3096 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.3097 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.3098 @@ -48804,30 +50111,26 @@
1.3099 fi
1.3100 fi
1.3101
1.3102 - fi
1.3103 fi
1.3104
1.3105 if test "x$MSVC_DLL" = x; then
1.3106 - # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.3107 - # (This was the original behaviour; kept since it might turn something up)
1.3108 - if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.3109 - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.3110 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.3111 - | $GREP x64 | $HEAD --lines 1`
1.3112 - else
1.3113 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.3114 - | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.3115 - if test "x$POSSIBLE_MSVC_DLL" = x; then
1.3116 - # We're grasping at straws now...
1.3117 - POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.3118 - | $HEAD --lines 1`
1.3119 - fi
1.3120 - fi
1.3121 -
1.3122 + # Probe: Look in the Windows system32 directory
1.3123 + CYGWIN_SYSTEMROOT="$SYSTEMROOT"
1.3124 +
1.3125 + windows_path="$CYGWIN_SYSTEMROOT"
1.3126 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3127 + unix_path=`$CYGPATH -u "$windows_path"`
1.3128 + CYGWIN_SYSTEMROOT="$unix_path"
1.3129 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3130 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3131 + CYGWIN_SYSTEMROOT="$unix_path"
1.3132 + fi
1.3133 +
1.3134 + POSSIBLE_MSVC_DLL="$CYGWIN_SYSTEMROOT/system32/$DLL_NAME"
1.3135
1.3136 DLL_NAME="$DLL_NAME"
1.3137 POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.3138 - METHOD="search of VCINSTALLDIR"
1.3139 + METHOD="well-known location in SYSTEMROOT"
1.3140 if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.3141 { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.3142 $as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.3143 @@ -48855,6 +50158,128 @@
1.3144 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.3145 $as_echo "ok" >&6; }
1.3146 MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.3147 +
1.3148 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3149 +
1.3150 + # Input might be given as Windows format, start by converting to
1.3151 + # unix format.
1.3152 + path="$MSVC_DLL"
1.3153 + new_path=`$CYGPATH -u "$path"`
1.3154 +
1.3155 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.3156 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.3157 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.3158 + # "foo.exe" is OK but "foo" is an error.
1.3159 + #
1.3160 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.3161 + # It is also a way to make sure we got the proper file name for the real test later on.
1.3162 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.3163 + if test "x$test_shortpath" = x; then
1.3164 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3165 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3166 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.3167 + fi
1.3168 +
1.3169 + # Call helper function which possibly converts this using DOS-style short mode.
1.3170 + # If so, the updated path is stored in $new_path.
1.3171 +
1.3172 + input_path="$new_path"
1.3173 + # Check if we need to convert this using DOS-style short mode. If the path
1.3174 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3175 + # take no chances and rewrite it.
1.3176 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3177 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.3178 + if test "x$has_forbidden_chars" != x; then
1.3179 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3180 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.3181 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.3182 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.3183 + # Going to short mode and back again did indeed matter. Since short mode is
1.3184 + # case insensitive, let's make it lowercase to improve readability.
1.3185 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3186 + # Now convert it back to Unix-style (cygpath)
1.3187 + input_path=`$CYGPATH -u "$shortmode_path"`
1.3188 + new_path="$input_path"
1.3189 + fi
1.3190 + fi
1.3191 +
1.3192 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.3193 + if test "x$test_cygdrive_prefix" = x; then
1.3194 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.3195 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.3196 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.3197 + # a path prefixed by /cygdrive for fixpath to work.
1.3198 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.3199 + fi
1.3200 + fi
1.3201 +
1.3202 +
1.3203 + if test "x$path" != "x$new_path"; then
1.3204 + MSVC_DLL="$new_path"
1.3205 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3206 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3207 + fi
1.3208 +
1.3209 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3210 +
1.3211 + path="$MSVC_DLL"
1.3212 + has_colon=`$ECHO $path | $GREP ^.:`
1.3213 + new_path="$path"
1.3214 + if test "x$has_colon" = x; then
1.3215 + # Not in mixed or Windows style, start by that.
1.3216 + new_path=`cmd //c echo $path`
1.3217 + fi
1.3218 +
1.3219 +
1.3220 + input_path="$new_path"
1.3221 + # Check if we need to convert this using DOS-style short mode. If the path
1.3222 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3223 + # take no chances and rewrite it.
1.3224 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3225 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.3226 + if test "x$has_forbidden_chars" != x; then
1.3227 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3228 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3229 + fi
1.3230 +
1.3231 +
1.3232 + windows_path="$new_path"
1.3233 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3234 + unix_path=`$CYGPATH -u "$windows_path"`
1.3235 + new_path="$unix_path"
1.3236 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3237 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3238 + new_path="$unix_path"
1.3239 + fi
1.3240 +
1.3241 + if test "x$path" != "x$new_path"; then
1.3242 + MSVC_DLL="$new_path"
1.3243 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3244 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3245 + fi
1.3246 +
1.3247 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.3248 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.3249 +
1.3250 + else
1.3251 + # We're on a posix platform. Hooray! :)
1.3252 + path="$MSVC_DLL"
1.3253 + has_space=`$ECHO "$path" | $GREP " "`
1.3254 + if test "x$has_space" != x; then
1.3255 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3256 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3257 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.3258 + fi
1.3259 +
1.3260 + # Use eval to expand a potential ~
1.3261 + eval path="$path"
1.3262 + if test ! -f "$path" && test ! -d "$path"; then
1.3263 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.3264 + fi
1.3265 +
1.3266 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.3267 + fi
1.3268 +
1.3269 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.3270 $as_echo_n "checking for $DLL_NAME... " >&6; }
1.3271 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.3272 @@ -48867,6 +50292,379 @@
1.3273 fi
1.3274 fi
1.3275
1.3276 + fi
1.3277 +
1.3278 + if test "x$MSVC_DLL" = x; then
1.3279 + # Probe: If Visual Studio Express is installed, there is usually one with the debugger
1.3280 + if test "x$VS100COMNTOOLS" != x; then
1.3281 + CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
1.3282 +
1.3283 + windows_path="$CYGWIN_VS_TOOLS_DIR"
1.3284 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3285 + unix_path=`$CYGPATH -u "$windows_path"`
1.3286 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.3287 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3288 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3289 + CYGWIN_VS_TOOLS_DIR="$unix_path"
1.3290 + fi
1.3291 +
1.3292 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.3293 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.3294 + | $GREP -i /x64/ | $HEAD --lines 1`
1.3295 + else
1.3296 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
1.3297 + | $GREP -i /x86/ | $HEAD --lines 1`
1.3298 + fi
1.3299 +
1.3300 + DLL_NAME="$DLL_NAME"
1.3301 + POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.3302 + METHOD="search of VS100COMNTOOLS"
1.3303 + if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.3304 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.3305 +$as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.3306 +
1.3307 + # Need to check if the found msvcr is correct architecture
1.3308 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found $DLL_NAME architecture" >&5
1.3309 +$as_echo_n "checking found $DLL_NAME architecture... " >&6; }
1.3310 + MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
1.3311 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3312 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.3313 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.3314 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.3315 + CORRECT_MSVCR_ARCH="PE32 executable"
1.3316 + else
1.3317 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.3318 + fi
1.3319 + else
1.3320 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.3321 + CORRECT_MSVCR_ARCH=386
1.3322 + else
1.3323 + CORRECT_MSVCR_ARCH=x86-64
1.3324 + fi
1.3325 + fi
1.3326 + if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.3327 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.3328 +$as_echo "ok" >&6; }
1.3329 + MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.3330 +
1.3331 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3332 +
1.3333 + # Input might be given as Windows format, start by converting to
1.3334 + # unix format.
1.3335 + path="$MSVC_DLL"
1.3336 + new_path=`$CYGPATH -u "$path"`
1.3337 +
1.3338 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.3339 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.3340 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.3341 + # "foo.exe" is OK but "foo" is an error.
1.3342 + #
1.3343 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.3344 + # It is also a way to make sure we got the proper file name for the real test later on.
1.3345 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.3346 + if test "x$test_shortpath" = x; then
1.3347 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3348 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3349 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.3350 + fi
1.3351 +
1.3352 + # Call helper function which possibly converts this using DOS-style short mode.
1.3353 + # If so, the updated path is stored in $new_path.
1.3354 +
1.3355 + input_path="$new_path"
1.3356 + # Check if we need to convert this using DOS-style short mode. If the path
1.3357 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3358 + # take no chances and rewrite it.
1.3359 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3360 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.3361 + if test "x$has_forbidden_chars" != x; then
1.3362 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3363 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.3364 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.3365 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.3366 + # Going to short mode and back again did indeed matter. Since short mode is
1.3367 + # case insensitive, let's make it lowercase to improve readability.
1.3368 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3369 + # Now convert it back to Unix-style (cygpath)
1.3370 + input_path=`$CYGPATH -u "$shortmode_path"`
1.3371 + new_path="$input_path"
1.3372 + fi
1.3373 + fi
1.3374 +
1.3375 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.3376 + if test "x$test_cygdrive_prefix" = x; then
1.3377 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.3378 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.3379 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.3380 + # a path prefixed by /cygdrive for fixpath to work.
1.3381 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.3382 + fi
1.3383 + fi
1.3384 +
1.3385 +
1.3386 + if test "x$path" != "x$new_path"; then
1.3387 + MSVC_DLL="$new_path"
1.3388 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3389 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3390 + fi
1.3391 +
1.3392 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3393 +
1.3394 + path="$MSVC_DLL"
1.3395 + has_colon=`$ECHO $path | $GREP ^.:`
1.3396 + new_path="$path"
1.3397 + if test "x$has_colon" = x; then
1.3398 + # Not in mixed or Windows style, start by that.
1.3399 + new_path=`cmd //c echo $path`
1.3400 + fi
1.3401 +
1.3402 +
1.3403 + input_path="$new_path"
1.3404 + # Check if we need to convert this using DOS-style short mode. If the path
1.3405 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3406 + # take no chances and rewrite it.
1.3407 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3408 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.3409 + if test "x$has_forbidden_chars" != x; then
1.3410 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3411 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3412 + fi
1.3413 +
1.3414 +
1.3415 + windows_path="$new_path"
1.3416 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3417 + unix_path=`$CYGPATH -u "$windows_path"`
1.3418 + new_path="$unix_path"
1.3419 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3420 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3421 + new_path="$unix_path"
1.3422 + fi
1.3423 +
1.3424 + if test "x$path" != "x$new_path"; then
1.3425 + MSVC_DLL="$new_path"
1.3426 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3427 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3428 + fi
1.3429 +
1.3430 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.3431 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.3432 +
1.3433 + else
1.3434 + # We're on a posix platform. Hooray! :)
1.3435 + path="$MSVC_DLL"
1.3436 + has_space=`$ECHO "$path" | $GREP " "`
1.3437 + if test "x$has_space" != x; then
1.3438 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3439 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3440 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.3441 + fi
1.3442 +
1.3443 + # Use eval to expand a potential ~
1.3444 + eval path="$path"
1.3445 + if test ! -f "$path" && test ! -d "$path"; then
1.3446 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.3447 + fi
1.3448 +
1.3449 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.3450 + fi
1.3451 +
1.3452 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.3453 +$as_echo_n "checking for $DLL_NAME... " >&6; }
1.3454 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.3455 +$as_echo "$MSVC_DLL" >&6; }
1.3456 + else
1.3457 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.3458 +$as_echo "incorrect, ignoring" >&6; }
1.3459 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE" >&5
1.3460 +$as_echo "$as_me: The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE" >&6;}
1.3461 + fi
1.3462 + fi
1.3463 +
1.3464 + fi
1.3465 + fi
1.3466 +
1.3467 + if test "x$MSVC_DLL" = x; then
1.3468 + # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
1.3469 + # (This was the original behaviour; kept since it might turn something up)
1.3470 + if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
1.3471 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
1.3472 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.3473 + | $GREP x64 | $HEAD --lines 1`
1.3474 + else
1.3475 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.3476 + | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
1.3477 + if test "x$POSSIBLE_MSVC_DLL" = x; then
1.3478 + # We're grasping at straws now...
1.3479 + POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
1.3480 + | $HEAD --lines 1`
1.3481 + fi
1.3482 + fi
1.3483 +
1.3484 +
1.3485 + DLL_NAME="$DLL_NAME"
1.3486 + POSSIBLE_MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.3487 + METHOD="search of VCINSTALLDIR"
1.3488 + if test -n "$POSSIBLE_MSVC_DLL" -a -e "$POSSIBLE_MSVC_DLL"; then
1.3489 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&5
1.3490 +$as_echo "$as_me: Found $DLL_NAME at $POSSIBLE_MSVC_DLL using $METHOD" >&6;}
1.3491 +
1.3492 + # Need to check if the found msvcr is correct architecture
1.3493 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking found $DLL_NAME architecture" >&5
1.3494 +$as_echo_n "checking found $DLL_NAME architecture... " >&6; }
1.3495 + MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
1.3496 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3497 + # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
1.3498 + # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
1.3499 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.3500 + CORRECT_MSVCR_ARCH="PE32 executable"
1.3501 + else
1.3502 + CORRECT_MSVCR_ARCH="PE32+ executable"
1.3503 + fi
1.3504 + else
1.3505 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
1.3506 + CORRECT_MSVCR_ARCH=386
1.3507 + else
1.3508 + CORRECT_MSVCR_ARCH=x86-64
1.3509 + fi
1.3510 + fi
1.3511 + if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
1.3512 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
1.3513 +$as_echo "ok" >&6; }
1.3514 + MSVC_DLL="$POSSIBLE_MSVC_DLL"
1.3515 +
1.3516 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3517 +
1.3518 + # Input might be given as Windows format, start by converting to
1.3519 + # unix format.
1.3520 + path="$MSVC_DLL"
1.3521 + new_path=`$CYGPATH -u "$path"`
1.3522 +
1.3523 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.3524 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.3525 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.3526 + # "foo.exe" is OK but "foo" is an error.
1.3527 + #
1.3528 + # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.3529 + # It is also a way to make sure we got the proper file name for the real test later on.
1.3530 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.3531 + if test "x$test_shortpath" = x; then
1.3532 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3533 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3534 + as_fn_error $? "Cannot locate the the path of MSVC_DLL" "$LINENO" 5
1.3535 + fi
1.3536 +
1.3537 + # Call helper function which possibly converts this using DOS-style short mode.
1.3538 + # If so, the updated path is stored in $new_path.
1.3539 +
1.3540 + input_path="$new_path"
1.3541 + # Check if we need to convert this using DOS-style short mode. If the path
1.3542 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3543 + # take no chances and rewrite it.
1.3544 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3545 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.3546 + if test "x$has_forbidden_chars" != x; then
1.3547 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3548 + shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.3549 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.3550 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.3551 + # Going to short mode and back again did indeed matter. Since short mode is
1.3552 + # case insensitive, let's make it lowercase to improve readability.
1.3553 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3554 + # Now convert it back to Unix-style (cygpath)
1.3555 + input_path=`$CYGPATH -u "$shortmode_path"`
1.3556 + new_path="$input_path"
1.3557 + fi
1.3558 + fi
1.3559 +
1.3560 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.3561 + if test "x$test_cygdrive_prefix" = x; then
1.3562 + # As a simple fix, exclude /usr/bin since it's not a real path.
1.3563 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.3564 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.3565 + # a path prefixed by /cygdrive for fixpath to work.
1.3566 + new_path="$CYGWIN_ROOT_PATH$input_path"
1.3567 + fi
1.3568 + fi
1.3569 +
1.3570 +
1.3571 + if test "x$path" != "x$new_path"; then
1.3572 + MSVC_DLL="$new_path"
1.3573 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3574 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3575 + fi
1.3576 +
1.3577 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3578 +
1.3579 + path="$MSVC_DLL"
1.3580 + has_colon=`$ECHO $path | $GREP ^.:`
1.3581 + new_path="$path"
1.3582 + if test "x$has_colon" = x; then
1.3583 + # Not in mixed or Windows style, start by that.
1.3584 + new_path=`cmd //c echo $path`
1.3585 + fi
1.3586 +
1.3587 +
1.3588 + input_path="$new_path"
1.3589 + # Check if we need to convert this using DOS-style short mode. If the path
1.3590 + # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3591 + # take no chances and rewrite it.
1.3592 + # Note: m4 eats our [], so we need to use [ and ] instead.
1.3593 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.3594 + if test "x$has_forbidden_chars" != x; then
1.3595 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3596 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3597 + fi
1.3598 +
1.3599 +
1.3600 + windows_path="$new_path"
1.3601 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3602 + unix_path=`$CYGPATH -u "$windows_path"`
1.3603 + new_path="$unix_path"
1.3604 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3605 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3606 + new_path="$unix_path"
1.3607 + fi
1.3608 +
1.3609 + if test "x$path" != "x$new_path"; then
1.3610 + MSVC_DLL="$new_path"
1.3611 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVC_DLL to \"$new_path\"" >&5
1.3612 +$as_echo "$as_me: Rewriting MSVC_DLL to \"$new_path\"" >&6;}
1.3613 + fi
1.3614 +
1.3615 + # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.3616 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.3617 +
1.3618 + else
1.3619 + # We're on a posix platform. Hooray! :)
1.3620 + path="$MSVC_DLL"
1.3621 + has_space=`$ECHO "$path" | $GREP " "`
1.3622 + if test "x$has_space" != x; then
1.3623 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&5
1.3624 +$as_echo "$as_me: The path of MSVC_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3625 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.3626 + fi
1.3627 +
1.3628 + # Use eval to expand a potential ~
1.3629 + eval path="$path"
1.3630 + if test ! -f "$path" && test ! -d "$path"; then
1.3631 + as_fn_error $? "The path of MSVC_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.3632 + fi
1.3633 +
1.3634 + MSVC_DLL="`cd "$path"; $THEPWDCMD -L`"
1.3635 + fi
1.3636 +
1.3637 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $DLL_NAME" >&5
1.3638 +$as_echo_n "checking for $DLL_NAME... " >&6; }
1.3639 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSVC_DLL" >&5
1.3640 +$as_echo "$MSVC_DLL" >&6; }
1.3641 + else
1.3642 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: incorrect, ignoring" >&5
1.3643 +$as_echo "incorrect, ignoring" >&6; }
1.3644 + { $as_echo "$as_me:${as_lineno-$LINENO}: The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE" >&5
1.3645 +$as_echo "$as_me: The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE" >&6;}
1.3646 + fi
1.3647 + fi
1.3648 +
1.3649 fi
1.3650 fi
1.3651
1.3652 @@ -48878,133 +50676,9 @@
1.3653 as_fn_error $? "Could not find $DLL_NAME. Please specify using --with-msvcr-dll." "$LINENO" 5
1.3654 fi
1.3655
1.3656 - MSVCP_DLL=$MSVC_DLL
1.3657 -
1.3658 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3659 -
1.3660 - # Input might be given as Windows format, start by converting to
1.3661 - # unix format.
1.3662 - path="$MSVCP_DLL"
1.3663 - new_path=`$CYGPATH -u "$path"`
1.3664 -
1.3665 - # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
1.3666 - # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
1.3667 - # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
1.3668 - # "foo.exe" is OK but "foo" is an error.
1.3669 - #
1.3670 - # This test is therefore slightly more accurate than "test -f" to check for file precense.
1.3671 - # It is also a way to make sure we got the proper file name for the real test later on.
1.3672 - test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
1.3673 - if test "x$test_shortpath" = x; then
1.3674 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCP_DLL, which resolves as \"$path\", is invalid." >&5
1.3675 -$as_echo "$as_me: The path of MSVCP_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3676 - as_fn_error $? "Cannot locate the the path of MSVCP_DLL" "$LINENO" 5
1.3677 - fi
1.3678 -
1.3679 - # Call helper function which possibly converts this using DOS-style short mode.
1.3680 - # If so, the updated path is stored in $new_path.
1.3681 -
1.3682 - input_path="$new_path"
1.3683 - # Check if we need to convert this using DOS-style short mode. If the path
1.3684 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3685 - # take no chances and rewrite it.
1.3686 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.3687 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
1.3688 - if test "x$has_forbidden_chars" != x; then
1.3689 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3690 - shortmode_path=`$CYGPATH -s -m -a "$input_path"`
1.3691 - path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
1.3692 - if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
1.3693 - # Going to short mode and back again did indeed matter. Since short mode is
1.3694 - # case insensitive, let's make it lowercase to improve readability.
1.3695 - shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3696 - # Now convert it back to Unix-stile (cygpath)
1.3697 - input_path=`$CYGPATH -u "$shortmode_path"`
1.3698 - new_path="$input_path"
1.3699 - fi
1.3700 - fi
1.3701 -
1.3702 - test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
1.3703 - if test "x$test_cygdrive_prefix" = x; then
1.3704 - # As a simple fix, exclude /usr/bin since it's not a real path.
1.3705 - if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
1.3706 - # The path is in a Cygwin special directory (e.g. /home). We need this converted to
1.3707 - # a path prefixed by /cygdrive for fixpath to work.
1.3708 - new_path="$CYGWIN_ROOT_PATH$input_path"
1.3709 - fi
1.3710 - fi
1.3711 -
1.3712 -
1.3713 - if test "x$path" != "x$new_path"; then
1.3714 - MSVCP_DLL="$new_path"
1.3715 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCP_DLL to \"$new_path\"" >&5
1.3716 -$as_echo "$as_me: Rewriting MSVCP_DLL to \"$new_path\"" >&6;}
1.3717 - fi
1.3718 -
1.3719 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3720 -
1.3721 - path="$MSVCP_DLL"
1.3722 - has_colon=`$ECHO $path | $GREP ^.:`
1.3723 - new_path="$path"
1.3724 - if test "x$has_colon" = x; then
1.3725 - # Not in mixed or Windows style, start by that.
1.3726 - new_path=`cmd //c echo $path`
1.3727 - fi
1.3728 -
1.3729 -
1.3730 - input_path="$new_path"
1.3731 - # Check if we need to convert this using DOS-style short mode. If the path
1.3732 - # contains just simple characters, use it. Otherwise (spaces, weird characters),
1.3733 - # take no chances and rewrite it.
1.3734 - # Note: m4 eats our [], so we need to use [ and ] instead.
1.3735 - has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
1.3736 - if test "x$has_forbidden_chars" != x; then
1.3737 - # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
1.3738 - new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.3739 - fi
1.3740 -
1.3741 -
1.3742 - windows_path="$new_path"
1.3743 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.3744 - unix_path=`$CYGPATH -u "$windows_path"`
1.3745 - new_path="$unix_path"
1.3746 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
1.3747 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
1.3748 - new_path="$unix_path"
1.3749 - fi
1.3750 -
1.3751 - if test "x$path" != "x$new_path"; then
1.3752 - MSVCP_DLL="$new_path"
1.3753 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MSVCP_DLL to \"$new_path\"" >&5
1.3754 -$as_echo "$as_me: Rewriting MSVCP_DLL to \"$new_path\"" >&6;}
1.3755 - fi
1.3756 -
1.3757 - # Save the first 10 bytes of this path to the storage, so fixpath can work.
1.3758 - all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
1.3759 -
1.3760 - else
1.3761 - # We're on a posix platform. Hooray! :)
1.3762 - path="$MSVCP_DLL"
1.3763 - has_space=`$ECHO "$path" | $GREP " "`
1.3764 - if test "x$has_space" != x; then
1.3765 - { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCP_DLL, which resolves as \"$path\", is invalid." >&5
1.3766 -$as_echo "$as_me: The path of MSVCP_DLL, which resolves as \"$path\", is invalid." >&6;}
1.3767 - as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
1.3768 - fi
1.3769 -
1.3770 - # Use eval to expand a potential ~
1.3771 - eval path="$path"
1.3772 - if test ! -f "$path" && test ! -d "$path"; then
1.3773 - as_fn_error $? "The path of MSVCP_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.3774 - fi
1.3775 -
1.3776 - MSVCP_DLL="`cd "$path"; $THEPWDCMD -L`"
1.3777 - fi
1.3778 -
1.3779 - MSVCP_DLL=$MSVCP_DLL
1.3780 -
1.3781 -
1.3782 - fi
1.3783 + MSVCP_DLL="$MSVC_DLL"
1.3784 + fi
1.3785 +
1.3786 fi
1.3787
1.3788
