author | ihse |
Mon, 04 Nov 2019 11:15:45 +0100 | |
changeset 58909 | 66f7d2494d4e |
parent 58270 | 2921ee5e9881 |
permissions | -rw-r--r-- |
14111 | 1 |
# |
41458 | 2 |
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
14111 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
AC_DEFUN([BASIC_WINDOWS_REWRITE_AS_UNIX_PATH], |
|
27 |
[ |
|
28 |
windows_path="[$]$1" |
|
29 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
|
30 |
unix_path=`$CYGPATH -u "$windows_path"` |
|
31 |
$1="$unix_path" |
|
32 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
|
33 |
unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` |
|
34 |
$1="$unix_path" |
|
53110 | 35 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
36 |
# wslpath does not check the input, only call if an actual windows path was |
|
37 |
# given. |
|
38 |
if $ECHO "$windows_path" | $GREP -q ["^[a-zA-Z]:[\\\\/]"]; then |
|
39 |
unix_path=`$WSLPATH -u "$windows_path"` |
|
40 |
$1="$unix_path" |
|
41 |
fi |
|
14111 | 42 |
fi |
43 |
]) |
|
44 |
||
45 |
AC_DEFUN([BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH], |
|
46 |
[ |
|
47 |
unix_path="[$]$1" |
|
48 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
|
49 |
windows_path=`$CYGPATH -m "$unix_path"` |
|
50 |
$1="$windows_path" |
|
51 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
|
52 |
windows_path=`cmd //c echo $unix_path` |
|
53 |
$1="$windows_path" |
|
53110 | 54 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
55 |
windows_path=`$WSLPATH -m "$unix_path"` |
|
56 |
$1="$windows_path" |
|
14111 | 57 |
fi |
58 |
]) |
|
59 |
||
60 |
# Helper function which possibly converts a path using DOS-style short mode. |
|
61 |
# If so, the updated path is stored in $new_path. |
|
62 |
# $1: The path to check |
|
63 |
AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN], |
|
64 |
[ |
|
65 |
input_path="$1" |
|
66 |
# Check if we need to convert this using DOS-style short mode. If the path |
|
67 |
# contains just simple characters, use it. Otherwise (spaces, weird characters), |
|
68 |
# take no chances and rewrite it. |
|
69 |
# Note: m4 eats our [], so we need to use @<:@ and @:>@ instead. |
|
70 |
has_forbidden_chars=`$ECHO "$input_path" | $GREP @<:@^-._/a-zA-Z0-9@:>@` |
|
71 |
if test "x$has_forbidden_chars" != x; then |
|
72 |
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) |
|
73 |
shortmode_path=`$CYGPATH -s -m -a "$input_path"` |
|
74 |
path_after_shortmode=`$CYGPATH -u "$shortmode_path"` |
|
75 |
if test "x$path_after_shortmode" != "x$input_to_shortpath"; then |
|
76 |
# Going to short mode and back again did indeed matter. Since short mode is |
|
77 |
# case insensitive, let's make it lowercase to improve readability. |
|
78 |
shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
|
30022 | 79 |
# Now convert it back to Unix-style (cygpath) |
14111 | 80 |
input_path=`$CYGPATH -u "$shortmode_path"` |
81 |
new_path="$input_path" |
|
82 |
fi |
|
83 |
fi |
|
84 |
||
85 |
test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` |
|
86 |
if test "x$test_cygdrive_prefix" = x; then |
|
87 |
# As a simple fix, exclude /usr/bin since it's not a real path. |
|
88 |
if test "x`$ECHO $1 | $GREP ^/usr/bin/`" = x; then |
|
89 |
# The path is in a Cygwin special directory (e.g. /home). We need this converted to |
|
90 |
# a path prefixed by /cygdrive for fixpath to work. |
|
91 |
new_path="$CYGWIN_ROOT_PATH$input_path" |
|
92 |
fi |
|
93 |
fi |
|
94 |
]) |
|
95 |
||
96 |
# Helper function which possibly converts a path using DOS-style short mode. |
|
97 |
# If so, the updated path is stored in $new_path. |
|
98 |
# $1: The path to check |
|
99 |
AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS], |
|
100 |
[ |
|
101 |
input_path="$1" |
|
102 |
# Check if we need to convert this using DOS-style short mode. If the path |
|
103 |
# contains just simple characters, use it. Otherwise (spaces, weird characters), |
|
104 |
# take no chances and rewrite it. |
|
105 |
# Note: m4 eats our [], so we need to use @<:@ and @:>@ instead. |
|
106 |
has_forbidden_chars=`$ECHO "$input_path" | $GREP @<:@^-_/:a-zA-Z0-9@:>@` |
|
107 |
if test "x$has_forbidden_chars" != x; then |
|
108 |
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) |
|
109 |
new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
|
110 |
fi |
|
111 |
]) |
|
112 |
||
53110 | 113 |
# Helper function which possibly converts a path using DOS-style short mode. |
114 |
# If so, the updated path is stored in $new_path. |
|
115 |
# $1: The path to check |
|
116 |
AC_DEFUN([BASIC_MAKE_WINDOWS_SPACE_SAFE_WSL], |
|
117 |
[ |
|
118 |
input_path="$1" |
|
119 |
# Check if we need to convert this using DOS-style short mode. If the path |
|
120 |
# contains just simple characters, use it. Otherwise (spaces, weird characters), |
|
121 |
# take no chances and rewrite it. |
|
122 |
# Note: m4 eats our [], so we need to use @<:@ and @:>@ instead. |
|
123 |
has_forbidden_chars=`$ECHO "$input_path" | $GREP [[^-_/:a-zA-Z0-9\\.]]` |
|
124 |
if test "x$has_forbidden_chars" != x; then |
|
125 |
# Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) |
|
126 |
TOPDIR_windows="$TOPDIR" |
|
127 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([TOPDIR_windows]) |
|
128 |
# First convert to Windows path to make input valid for cmd |
|
129 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([input_path]) |
|
130 |
new_path=`$CMD /c $TOPDIR_windows/make/scripts/windowsShortName.bat "$input_path" \ |
|
131 |
| $SED -e 's|\r||g' \ |
|
132 |
| $TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
|
133 |
# Rewrite back to unix style |
|
134 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) |
|
135 |
fi |
|
136 |
]) |
|
137 |
||
14111 | 138 |
# FIXME: The BASIC_FIXUP_*_CYGWIN/MSYS is most likely too convoluted |
139 |
# and could probably be heavily simplified. However, all changes in this |
|
140 |
# area tend to need lot of testing in different scenarios, and in lack of |
|
141 |
# proper unit testing, cleaning this up has not been deemed worth the effort |
|
142 |
# at the moment. |
|
143 |
||
144 |
AC_DEFUN([BASIC_FIXUP_PATH_CYGWIN], |
|
145 |
[ |
|
146 |
# Input might be given as Windows format, start by converting to |
|
147 |
# unix format. |
|
148 |
path="[$]$1" |
|
149 |
new_path=`$CYGPATH -u "$path"` |
|
150 |
||
58270
2921ee5e9881
8206125: [windows] cannot pass relative path to --with-boot-jdk
erikj
parents:
54455
diff
changeset
|
151 |
BASIC_ABSOLUTE_PATH(new_path) |
2921ee5e9881
8206125: [windows] cannot pass relative path to --with-boot-jdk
erikj
parents:
54455
diff
changeset
|
152 |
|
14111 | 153 |
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are |
154 |
# named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered |
|
155 |
# the same file, most of the time (as in "test -f"). But not when running cygpath -s, then |
|
156 |
# "foo.exe" is OK but "foo" is an error. |
|
157 |
# |
|
158 |
# This test is therefore slightly more accurate than "test -f" to check for file precense. |
|
159 |
# It is also a way to make sure we got the proper file name for the real test later on. |
|
160 |
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` |
|
161 |
if test "x$test_shortpath" = x; then |
|
162 |
AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.]) |
|
163 |
AC_MSG_ERROR([Cannot locate the the path of $1]) |
|
164 |
fi |
|
165 |
||
166 |
# Call helper function which possibly converts this using DOS-style short mode. |
|
167 |
# If so, the updated path is stored in $new_path. |
|
168 |
BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN([$new_path]) |
|
169 |
||
170 |
if test "x$path" != "x$new_path"; then |
|
171 |
$1="$new_path" |
|
172 |
AC_MSG_NOTICE([Rewriting $1 to "$new_path"]) |
|
173 |
fi |
|
174 |
]) |
|
175 |
||
176 |
AC_DEFUN([BASIC_FIXUP_PATH_MSYS], |
|
177 |
[ |
|
178 |
path="[$]$1" |
|
179 |
has_colon=`$ECHO $path | $GREP ^.:` |
|
180 |
new_path="$path" |
|
181 |
if test "x$has_colon" = x; then |
|
182 |
# Not in mixed or Windows style, start by that. |
|
183 |
new_path=`cmd //c echo $path` |
|
184 |
fi |
|
20363 | 185 |
|
58270
2921ee5e9881
8206125: [windows] cannot pass relative path to --with-boot-jdk
erikj
parents:
54455
diff
changeset
|
186 |
BASIC_ABSOLUTE_PATH(new_path) |
2921ee5e9881
8206125: [windows] cannot pass relative path to --with-boot-jdk
erikj
parents:
54455
diff
changeset
|
187 |
|
14111 | 188 |
BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) |
189 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
|
190 |
if test "x$path" != "x$new_path"; then |
|
191 |
$1="$new_path" |
|
192 |
AC_MSG_NOTICE([Rewriting $1 to "$new_path"]) |
|
193 |
fi |
|
194 |
||
195 |
# Save the first 10 bytes of this path to the storage, so fixpath can work. |
|
196 |
all_fixpath_prefixes=("${all_fixpath_prefixes@<:@@@:>@}" "${new_path:0:10}") |
|
197 |
]) |
|
198 |
||
53110 | 199 |
AC_DEFUN([BASIC_FIXUP_PATH_WSL], |
200 |
[ |
|
201 |
# Input might be given as Windows format, start by converting to |
|
202 |
# unix format. |
|
203 |
new_path="[$]$1" |
|
204 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) |
|
205 |
||
58270
2921ee5e9881
8206125: [windows] cannot pass relative path to --with-boot-jdk
erikj
parents:
54455
diff
changeset
|
206 |
BASIC_ABSOLUTE_PATH(new_path) |
2921ee5e9881
8206125: [windows] cannot pass relative path to --with-boot-jdk
erikj
parents:
54455
diff
changeset
|
207 |
|
53110 | 208 |
# Call helper function which possibly converts this using DOS-style short mode. |
209 |
# If so, the updated path is stored in $new_path. |
|
210 |
BASIC_MAKE_WINDOWS_SPACE_SAFE_WSL([$new_path]) |
|
211 |
||
212 |
if test "x$path" != "x$new_path"; then |
|
213 |
$1="$new_path" |
|
214 |
AC_MSG_NOTICE([Rewriting $1 to "$new_path"]) |
|
215 |
fi |
|
216 |
]) |
|
217 |
||
14111 | 218 |
AC_DEFUN([BASIC_FIXUP_EXECUTABLE_CYGWIN], |
219 |
[ |
|
220 |
# First separate the path from the arguments. This will split at the first |
|
221 |
# space. |
|
222 |
complete="[$]$1" |
|
223 |
path="${complete%% *}" |
|
224 |
tmp="$complete EOL" |
|
225 |
arguments="${tmp#* }" |
|
226 |
||
227 |
# Input might be given as Windows format, start by converting to |
|
228 |
# unix format. |
|
229 |
new_path=`$CYGPATH -u "$path"` |
|
230 |
||
231 |
# Now try to locate executable using which |
|
232 |
new_path=`$WHICH "$new_path" 2> /dev/null` |
|
14280
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
233 |
# bat and cmd files are not always considered executable in cygwin causing which |
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
234 |
# to not find them |
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
235 |
if test "x$new_path" = x \ |
20363 | 236 |
&& test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ |
237 |
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then |
|
14280
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
238 |
new_path=`$CYGPATH -u "$path"` |
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
239 |
fi |
14111 | 240 |
if test "x$new_path" = x; then |
241 |
# Oops. Which didn't find the executable. |
|
242 |
# The splitting of arguments from the executable at a space might have been incorrect, |
|
243 |
# since paths with space are more likely in Windows. Give it another try with the whole |
|
244 |
# argument. |
|
245 |
path="$complete" |
|
246 |
arguments="EOL" |
|
247 |
new_path=`$CYGPATH -u "$path"` |
|
248 |
new_path=`$WHICH "$new_path" 2> /dev/null` |
|
14280
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
249 |
# bat and cmd files are not always considered executable in cygwin causing which |
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
250 |
# to not find them |
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
251 |
if test "x$new_path" = x \ |
20363 | 252 |
&& test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ |
253 |
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then |
|
14280
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
254 |
new_path=`$CYGPATH -u "$path"` |
7d8ad47b2dbf
8002220: build-infra: update for mac, solaris 11 issues
erikj
parents:
14111
diff
changeset
|
255 |
fi |
14111 | 256 |
if test "x$new_path" = x; then |
257 |
# It's still not found. Now this is an unrecoverable error. |
|
258 |
AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) |
|
259 |
has_space=`$ECHO "$complete" | $GREP " "` |
|
260 |
if test "x$has_space" != x; then |
|
261 |
AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.]) |
|
262 |
fi |
|
263 |
AC_MSG_ERROR([Cannot locate the the path of $1]) |
|
264 |
fi |
|
265 |
fi |
|
266 |
||
267 |
# Cygwin tries to hide some aspects of the Windows file system, such that binaries are |
|
268 |
# named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered |
|
269 |
# the same file, most of the time (as in "test -f"). But not when running cygpath -s, then |
|
270 |
# "foo.exe" is OK but "foo" is an error. |
|
271 |
# |
|
19764
345aa6f8d18a
8024849: Don't remove upper case letters from username when setting USER_RELEASE_SUFFIX
ihse
parents:
17662
diff
changeset
|
272 |
# This test is therefore slightly more accurate than "test -f" to check for file presence. |
14111 | 273 |
# It is also a way to make sure we got the proper file name for the real test later on. |
274 |
test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` |
|
275 |
if test "x$test_shortpath" = x; then |
|
276 |
# Short path failed, file does not exist as specified. |
|
277 |
# Try adding .exe or .cmd |
|
278 |
if test -f "${new_path}.exe"; then |
|
20363 | 279 |
input_to_shortpath="${new_path}.exe" |
14111 | 280 |
elif test -f "${new_path}.cmd"; then |
20363 | 281 |
input_to_shortpath="${new_path}.cmd" |
14111 | 282 |
else |
283 |
AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.]) |
|
284 |
AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found]) |
|
285 |
AC_MSG_ERROR([Cannot locate the the path of $1]) |
|
286 |
fi |
|
287 |
else |
|
288 |
input_to_shortpath="$new_path" |
|
289 |
fi |
|
290 |
||
291 |
# Call helper function which possibly converts this using DOS-style short mode. |
|
292 |
# If so, the updated path is stored in $new_path. |
|
293 |
new_path="$input_to_shortpath" |
|
294 |
BASIC_MAKE_WINDOWS_SPACE_SAFE_CYGWIN([$input_to_shortpath]) |
|
295 |
# remove trailing .exe if any |
|
296 |
new_path="${new_path/%.exe/}" |
|
297 |
]) |
|
298 |
||
299 |
AC_DEFUN([BASIC_FIXUP_EXECUTABLE_MSYS], |
|
300 |
[ |
|
301 |
# First separate the path from the arguments. This will split at the first |
|
302 |
# space. |
|
303 |
complete="[$]$1" |
|
304 |
path="${complete%% *}" |
|
305 |
tmp="$complete EOL" |
|
306 |
arguments="${tmp#* }" |
|
307 |
||
308 |
# Input might be given as Windows format, start by converting to |
|
309 |
# unix format. |
|
310 |
new_path="$path" |
|
311 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
|
312 |
||
313 |
# Now try to locate executable using which |
|
314 |
new_path=`$WHICH "$new_path" 2> /dev/null` |
|
20363 | 315 |
|
14111 | 316 |
if test "x$new_path" = x; then |
317 |
# Oops. Which didn't find the executable. |
|
318 |
# The splitting of arguments from the executable at a space might have been incorrect, |
|
319 |
# since paths with space are more likely in Windows. Give it another try with the whole |
|
320 |
# argument. |
|
321 |
path="$complete" |
|
322 |
arguments="EOL" |
|
323 |
new_path="$path" |
|
324 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
|
20363 | 325 |
|
14111 | 326 |
new_path=`$WHICH "$new_path" 2> /dev/null` |
25882 | 327 |
# bat and cmd files are not always considered executable in MSYS causing which |
328 |
# to not find them |
|
329 |
if test "x$new_path" = x \ |
|
330 |
&& test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ |
|
331 |
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then |
|
332 |
new_path="$path" |
|
333 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
|
334 |
fi |
|
20363 | 335 |
|
14111 | 336 |
if test "x$new_path" = x; then |
337 |
# It's still not found. Now this is an unrecoverable error. |
|
338 |
AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) |
|
339 |
has_space=`$ECHO "$complete" | $GREP " "` |
|
340 |
if test "x$has_space" != x; then |
|
341 |
AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.]) |
|
342 |
fi |
|
343 |
AC_MSG_ERROR([Cannot locate the the path of $1]) |
|
344 |
fi |
|
345 |
fi |
|
346 |
||
347 |
# Now new_path has a complete unix path to the binary |
|
348 |
if test "x`$ECHO $new_path | $GREP ^/bin/`" != x; then |
|
349 |
# Keep paths in /bin as-is, but remove trailing .exe if any |
|
350 |
new_path="${new_path/%.exe/}" |
|
351 |
# Do not save /bin paths to all_fixpath_prefixes! |
|
352 |
else |
|
353 |
# Not in mixed or Windows style, start by that. |
|
354 |
new_path=`cmd //c echo $new_path` |
|
355 |
BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) |
|
356 |
# Output is in $new_path |
|
357 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) |
|
358 |
# remove trailing .exe if any |
|
359 |
new_path="${new_path/%.exe/}" |
|
360 |
||
361 |
# Save the first 10 bytes of this path to the storage, so fixpath can work. |
|
362 |
all_fixpath_prefixes=("${all_fixpath_prefixes@<:@@@:>@}" "${new_path:0:10}") |
|
363 |
fi |
|
364 |
]) |
|
365 |
||
53110 | 366 |
AC_DEFUN([BASIC_FIXUP_EXECUTABLE_WSL], |
367 |
[ |
|
368 |
# First separate the path from the arguments. This will split at the first |
|
369 |
# space. |
|
370 |
complete="[$]$1" |
|
371 |
path="${complete%% *}" |
|
372 |
tmp="$complete EOL" |
|
373 |
arguments="${tmp#* }" |
|
374 |
||
375 |
# Input might be given as Windows format, start by converting to |
|
376 |
# unix format. |
|
377 |
new_path="$path" |
|
378 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) |
|
379 |
||
380 |
# Now try to locate executable using which |
|
381 |
new_path_bak="$new_path" |
|
382 |
new_path=`$WHICH "$new_path" 2> /dev/null` |
|
383 |
# bat and cmd files are not considered executable in WSL |
|
384 |
if test "x$new_path" = x \ |
|
385 |
&& test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ |
|
386 |
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then |
|
387 |
new_path="$new_path_back" |
|
388 |
fi |
|
389 |
if test "x$new_path" = x; then |
|
390 |
# Oops. Which didn't find the executable. |
|
391 |
# The splitting of arguments from the executable at a space might have been incorrect, |
|
392 |
# since paths with space are more likely in Windows. Give it another try with the whole |
|
393 |
# argument. |
|
394 |
path="$complete" |
|
395 |
arguments="EOL" |
|
396 |
new_path="$path" |
|
397 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) |
|
398 |
new_path_bak="$new_path" |
|
399 |
new_path=`$WHICH "$new_path" 2> /dev/null` |
|
400 |
# bat and cmd files are not considered executable in WSL |
|
401 |
if test "x$new_path" = x \ |
|
402 |
&& test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ |
|
403 |
&& test "x`$LS \"$path\" 2>/dev/null`" != x; then |
|
404 |
new_path="$new_path_bak" |
|
405 |
fi |
|
406 |
if test "x$new_path" = x; then |
|
407 |
# It's still not found. Now this is an unrecoverable error. |
|
408 |
AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) |
|
409 |
has_space=`$ECHO "$complete" | $GREP " "` |
|
410 |
if test "x$has_space" != x; then |
|
411 |
AC_MSG_NOTICE([You might be mixing spaces in the path and extra arguments, which is not allowed.]) |
|
412 |
fi |
|
413 |
AC_MSG_ERROR([Cannot locate the the path of $1]) |
|
414 |
fi |
|
415 |
fi |
|
416 |
||
417 |
# In WSL, suffixes must be present for Windows executables |
|
418 |
if test ! -f "$new_path"; then |
|
419 |
# Try adding .exe or .cmd |
|
420 |
if test -f "${new_path}.exe"; then |
|
421 |
input_to_shortpath="${new_path}.exe" |
|
422 |
elif test -f "${new_path}.cmd"; then |
|
423 |
input_to_shortpath="${new_path}.cmd" |
|
424 |
else |
|
425 |
AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.]) |
|
426 |
AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found]) |
|
427 |
AC_MSG_ERROR([Cannot locate the the path of $1]) |
|
428 |
fi |
|
429 |
else |
|
430 |
input_to_shortpath="$new_path" |
|
431 |
fi |
|
432 |
||
433 |
# Call helper function which possibly converts this using DOS-style short mode. |
|
434 |
# If so, the updated path is stored in $new_path. |
|
435 |
new_path="$input_to_shortpath" |
|
436 |
BASIC_MAKE_WINDOWS_SPACE_SAFE_WSL([$input_to_shortpath]) |
|
437 |
]) |
|
438 |
||
14111 | 439 |
# Setup basic configuration paths, and platform-specific stuff related to PATHs. |
440 |
AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS], |
|
441 |
[ |
|
17662
8cae100e6f14
8014003: New build does not handle symlinks in workspace path
erikj
parents:
15071
diff
changeset
|
442 |
SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m` |
14111 | 443 |
if test $SRC_ROOT_LENGTH -gt 100; then |
20363 | 444 |
AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported]) |
14111 | 445 |
fi |
446 |
||
447 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
|
448 |
AC_MSG_CHECKING([cygwin release]) |
|
449 |
CYGWIN_VERSION=`$UNAME -r` |
|
450 |
AC_MSG_RESULT([$CYGWIN_VERSION]) |
|
451 |
WINDOWS_ENV_VENDOR='cygwin' |
|
452 |
WINDOWS_ENV_VERSION="$CYGWIN_VERSION" |
|
20363 | 453 |
|
30076 | 454 |
CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'` |
455 |
if test "x$CYGWIN_VERSION_OLD" != x; then |
|
14111 | 456 |
AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) |
457 |
AC_MSG_ERROR([Cannot continue]) |
|
458 |
fi |
|
459 |
if test "x$CYGPATH" = x; then |
|
20363 | 460 |
AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) |
14111 | 461 |
fi |
462 |
AC_MSG_CHECKING([cygwin root directory as unix-style path]) |
|
44025
34389f09ea47
8176033: New cygwin grep does not match \r as newline
erikj
parents:
41458
diff
changeset
|
463 |
# The cmd output ends with Windows line endings (CR/LF) |
34389f09ea47
8176033: New cygwin grep does not match \r as newline
erikj
parents:
41458
diff
changeset
|
464 |
cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'` |
14111 | 465 |
# Force cygpath to report the proper root by including a trailing space, and then stripping it off again. |
466 |
CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "` |
|
467 |
AC_MSG_RESULT([$CYGWIN_ROOT_PATH]) |
|
468 |
WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH" |
|
469 |
test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/` |
|
470 |
if test "x$test_cygdrive_prefix" = x; then |
|
20363 | 471 |
AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.]) |
14111 | 472 |
fi |
473 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
|
474 |
AC_MSG_CHECKING([msys release]) |
|
475 |
MSYS_VERSION=`$UNAME -r` |
|
476 |
AC_MSG_RESULT([$MSYS_VERSION]) |
|
20363 | 477 |
|
14111 | 478 |
WINDOWS_ENV_VENDOR='msys' |
479 |
WINDOWS_ENV_VERSION="$MSYS_VERSION" |
|
480 |
||
481 |
AC_MSG_CHECKING([msys root directory as unix-style path]) |
|
482 |
# The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away |
|
38843
2b141e8e916f
8158535: Configure script uses basic tools directly in many places
erikj
parents:
34101
diff
changeset
|
483 |
MSYS_ROOT_PATH=`cd / ; cmd /c cd | $GREP ".*"` |
14111 | 484 |
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(MSYS_ROOT_PATH) |
485 |
AC_MSG_RESULT([$MSYS_ROOT_PATH]) |
|
486 |
WINDOWS_ENV_ROOT_PATH="$MSYS_ROOT_PATH" |
|
53110 | 487 |
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
488 |
AC_MSG_CHECKING([Windows version]) |
|
489 |
# m4 replaces [ and ] so we use @<:@ and @:>@ instead |
|
490 |
WINDOWS_VERSION=`$CMD /c ver.exe | $EGREP -o '(@<:@0-9@:>@+\.)+@<:@0-9@:>@+'` |
|
491 |
AC_MSG_RESULT([$WINDOWS_VERSION]) |
|
492 |
||
493 |
AC_MSG_CHECKING([WSL kernel version]) |
|
494 |
WSL_KERNEL_VERSION=`$UNAME -v` |
|
495 |
AC_MSG_RESULT([$WSL_KERNEL_VERSION]) |
|
496 |
||
497 |
AC_MSG_CHECKING([WSL kernel release]) |
|
498 |
WSL_KERNEL_RELEASE=`$UNAME -r` |
|
499 |
AC_MSG_RESULT([$WSL_KERNEL_RELEASE]) |
|
500 |
||
501 |
AC_MSG_CHECKING([WSL distribution]) |
|
502 |
WSL_DISTRIBUTION=`$LSB_RELEASE -d | sed 's/Description:\t//'` |
|
503 |
AC_MSG_RESULT([$WSL_DISTRIBUTION]) |
|
504 |
||
505 |
WINDOWS_ENV_VENDOR='WSL' |
|
506 |
WINDOWS_ENV_VERSION="$WSL_DISTRIBUTION $WSL_KERNEL_VERSION $WSL_KERNEL_RELEASE (on Windows build $WINDOWS_VERSION)" |
|
14111 | 507 |
else |
53110 | 508 |
AC_MSG_ERROR([Unknown Windows environment. Neither cygwin, msys, nor wsl was detected.]) |
14111 | 509 |
fi |
510 |
||
511 |
# Test if windows or unix (cygwin/msys) find is first in path. |
|
512 |
AC_MSG_CHECKING([what kind of 'find' is first on the PATH]) |
|
513 |
FIND_BINARY_OUTPUT=`find --version 2>&1` |
|
514 |
if test "x`echo $FIND_BINARY_OUTPUT | $GREP GNU`" != x; then |
|
515 |
AC_MSG_RESULT([unix style]) |
|
516 |
elif test "x`echo $FIND_BINARY_OUTPUT | $GREP FIND`" != x; then |
|
517 |
AC_MSG_RESULT([Windows]) |
|
518 |
AC_MSG_NOTICE([Your path contains Windows tools (C:\Windows\system32) before your unix (cygwin or msys) tools.]) |
|
519 |
AC_MSG_NOTICE([This will not work. Please correct and make sure /usr/bin (or similar) is first in path.]) |
|
520 |
AC_MSG_ERROR([Cannot continue]) |
|
521 |
else |
|
522 |
AC_MSG_RESULT([unknown]) |
|
523 |
AC_MSG_WARN([It seems that your find utility is non-standard.]) |
|
524 |
fi |
|
525 |
]) |
|
526 |
||
527 |
AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH], |
|
528 |
[ |
|
20363 | 529 |
# When using cygwin or msys, we need a wrapper binary that renames |
530 |
# /cygdrive/c/ arguments into c:/ arguments and peeks into |
|
531 |
# @files and rewrites these too! This wrapper binary is |
|
532 |
# called fixpath. |
|
533 |
FIXPATH= |
|
534 |
if test "x$OPENJDK_BUILD_OS" = xwindows; then |
|
14111 | 535 |
AC_MSG_CHECKING([if fixpath can be created]) |
47252 | 536 |
FIXPATH_SRC="$TOPDIR/make/src/native/fixpath.c" |
29790 | 537 |
FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe" |
538 |
FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath" |
|
14111 | 539 |
if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then |
540 |
# Important to keep the .exe suffix on Cygwin for Hotspot makefiles |
|
29790 | 541 |
FIXPATH="$FIXPATH_BIN -c" |
14111 | 542 |
elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then |
543 |
# Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line |
|
544 |
# @ was chosen as separator to minimize risk of other tools messing around with it |
|
29790 | 545 |
all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \ |
38843
2b141e8e916f
8158535: Configure script uses basic tools directly in many places
erikj
parents:
34101
diff
changeset
|
546 |
| tr ' ' '\n' | $GREP '^/./' | $SORT | $UNIQ` |
14111 | 547 |
fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'` |
29790 | 548 |
FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list" |
53110 | 549 |
elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.wsl; then |
550 |
FIXPATH="$FIXPATH_BIN -w" |
|
14111 | 551 |
fi |
29790 | 552 |
FIXPATH_SRC_W="$FIXPATH_SRC" |
553 |
FIXPATH_BIN_W="$FIXPATH_BIN" |
|
554 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W]) |
|
555 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W]) |
|
556 |
$RM -rf $FIXPATH_BIN $FIXPATH_DIR |
|
557 |
$MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin |
|
558 |
cd $FIXPATH_DIR |
|
559 |
$CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1 |
|
54455
542735f2a53e
8221907: make reconfigure breaks when configured with relative paths
erikj
parents:
53110
diff
changeset
|
560 |
cd $CONFIGURE_START_DIR |
14111 | 561 |
|
29790 | 562 |
if test ! -x $FIXPATH_BIN; then |
20363 | 563 |
AC_MSG_RESULT([no]) |
29790 | 564 |
cat $FIXPATH_DIR/fixpath1.log |
565 |
AC_MSG_ERROR([Could not create $FIXPATH_BIN]) |
|
14111 | 566 |
fi |
567 |
AC_MSG_RESULT([yes]) |
|
53110 | 568 |
|
569 |
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then |
|
570 |
OLD_WSLENV="$WSLENV" |
|
571 |
WSLENV=`$ECHO $WSLENV | $SED 's/PATH\/l://'` |
|
572 |
BASIC_APPEND_TO_PATH(WSLENV, "FIXPATH_PATH") |
|
573 |
export WSLENV |
|
574 |
export FIXPATH_PATH=$VS_PATH_WINDOWS |
|
575 |
AC_MSG_NOTICE([FIXPATH_PATH is $FIXPATH_PATH]) |
|
576 |
AC_MSG_NOTICE([Rewriting WSLENV from $OLD_WSLENV to $WSLENV]) |
|
577 |
fi |
|
578 |
||
14111 | 579 |
AC_MSG_CHECKING([if fixpath.exe works]) |
29790 | 580 |
cd $FIXPATH_DIR |
581 |
$FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \ |
|
582 |
> $FIXPATH_DIR/fixpath2.log 2>&1 |
|
54455
542735f2a53e
8221907: make reconfigure breaks when configured with relative paths
erikj
parents:
53110
diff
changeset
|
583 |
cd $CONFIGURE_START_DIR |
29790 | 584 |
if test ! -x $FIXPATH_DIR/fixpath2.exe; then |
20363 | 585 |
AC_MSG_RESULT([no]) |
29790 | 586 |
cat $FIXPATH_DIR/fixpath2.log |
20363 | 587 |
AC_MSG_ERROR([fixpath did not work!]) |
14111 | 588 |
fi |
589 |
AC_MSG_RESULT([yes]) |
|
34101
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
30076
diff
changeset
|
590 |
|
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
30076
diff
changeset
|
591 |
FIXPATH_DETACH_FLAG="--detach" |
20363 | 592 |
fi |
14111 | 593 |
|
20363 | 594 |
AC_SUBST(FIXPATH) |
34101
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
30076
diff
changeset
|
595 |
AC_SUBST(FIXPATH_DETACH_FLAG) |
14111 | 596 |
]) |