Mercurial > jdk8-mips64-public / changeset
changeset
8007129: build-infra Add configure --with-jtreg option for location of JTREG
Tue, 28 May 2013 08:50:52 +0200
- author
- erikj
- date
- Tue, 28 May 2013 08:50:52 +0200
- changeset 718
- e7c09a983c3c
- parent 717
- e247ee3924d5
- child 719
- 3a36c926a7aa
8007129: build-infra Add configure --with-jtreg option for location of JTREG
Reviewed-by: tbell
1.1 --- a/common/autoconf/basics.m4 Wed May 22 17:26:31 2013 +0200 1.2 +++ b/common/autoconf/basics.m4 Tue May 28 08:50:52 2013 +0200 1.3 @@ -60,16 +60,19 @@ 1.4 else 1.5 # We're on a posix platform. Hooray! :) 1.6 path="[$]$1" 1.7 - 1.8 - if test ! -f "$path" && test ! -d "$path"; then 1.9 - AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) 1.10 - fi 1.11 - 1.12 has_space=`$ECHO "$path" | $GREP " "` 1.13 if test "x$has_space" != x; then 1.14 AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.]) 1.15 AC_MSG_ERROR([Spaces are not allowed in this path.]) 1.16 fi 1.17 + 1.18 + # Use eval to expand a potential ~ 1.19 + eval path="$path" 1.20 + if test ! -f "$path" && test ! -d "$path"; then 1.21 + AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) 1.22 + fi 1.23 + 1.24 + $1="`cd "$path"; $THEPWDCMD`" 1.25 fi 1.26 ]) 1.27
2.1 --- a/common/autoconf/generated-configure.sh Wed May 22 17:26:31 2013 +0200 2.2 +++ b/common/autoconf/generated-configure.sh Tue May 28 08:50:52 2013 +0200 2.3 @@ -681,6 +681,8 @@ 2.4 SHARED_LIBRARY 2.5 OBJ_SUFFIX 2.6 COMPILER_NAME 2.7 +JTREGEXE 2.8 +JT_HOME 2.9 LIPO 2.10 ac_ct_OBJDUMP 2.11 OBJDUMP 2.12 @@ -1004,6 +1006,7 @@ 2.13 with_dxsdk 2.14 with_dxsdk_lib 2.15 with_dxsdk_include 2.16 +with_jtreg 2.17 with_extra_cflags 2.18 with_extra_cxxflags 2.19 with_extra_ldflags 2.20 @@ -1762,6 +1765,7 @@ 2.21 [probed] 2.22 --with-dxsdk-include the DirectX SDK include directory (Windows only) 2.23 [probed] 2.24 + --with-jtreg Regression Test Harness [probed] 2.25 --with-extra-cflags extra flags to be used when compiling jdk c-files 2.26 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files 2.27 --with-extra-ldflags extra flags to be used when linking jdk 2.28 @@ -3723,6 +3727,9 @@ 2.29 2.30 2.31 2.32 +# Setup the JTREG paths 2.33 + 2.34 + 2.35 # 2.36 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 2.37 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.38 @@ -3773,7 +3780,7 @@ 2.39 #CUSTOM_AUTOCONF_INCLUDE 2.40 2.41 # Do not change or remove the following line, it is needed for consistency checks: 2.42 -DATE_WHEN_GENERATED=1369236348 2.43 +DATE_WHEN_GENERATED=1369723814 2.44 2.45 ############################################################################### 2.46 # 2.47 @@ -7387,17 +7394,20 @@ 2.48 else 2.49 # We're on a posix platform. Hooray! :) 2.50 path="$SRC_ROOT" 2.51 - 2.52 - if test ! -f "$path" && test ! -d "$path"; then 2.53 - as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 2.54 - fi 2.55 - 2.56 has_space=`$ECHO "$path" | $GREP " "` 2.57 if test "x$has_space" != x; then 2.58 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&5 2.59 $as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&6;} 2.60 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.61 fi 2.62 + 2.63 + # Use eval to expand a potential ~ 2.64 + eval path="$path" 2.65 + if test ! -f "$path" && test ! -d "$path"; then 2.66 + as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 2.67 + fi 2.68 + 2.69 + SRC_ROOT="`cd "$path"; $THEPWDCMD`" 2.70 fi 2.71 2.72 2.73 @@ -7506,17 +7516,20 @@ 2.74 else 2.75 # We're on a posix platform. Hooray! :) 2.76 path="$CURDIR" 2.77 - 2.78 - if test ! -f "$path" && test ! -d "$path"; then 2.79 - as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5 2.80 - fi 2.81 - 2.82 has_space=`$ECHO "$path" | $GREP " "` 2.83 if test "x$has_space" != x; then 2.84 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5 2.85 $as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;} 2.86 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.87 fi 2.88 + 2.89 + # Use eval to expand a potential ~ 2.90 + eval path="$path" 2.91 + if test ! -f "$path" && test ! -d "$path"; then 2.92 + as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5 2.93 + fi 2.94 + 2.95 + CURDIR="`cd "$path"; $THEPWDCMD`" 2.96 fi 2.97 2.98 2.99 @@ -8102,17 +8115,20 @@ 2.100 else 2.101 # We're on a posix platform. Hooray! :) 2.102 path="$OUTPUT_ROOT" 2.103 - 2.104 - if test ! -f "$path" && test ! -d "$path"; then 2.105 - as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 2.106 - fi 2.107 - 2.108 has_space=`$ECHO "$path" | $GREP " "` 2.109 if test "x$has_space" != x; then 2.110 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&5 2.111 $as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&6;} 2.112 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.113 fi 2.114 + 2.115 + # Use eval to expand a potential ~ 2.116 + eval path="$path" 2.117 + if test ! -f "$path" && test ! -d "$path"; then 2.118 + as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 2.119 + fi 2.120 + 2.121 + OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`" 2.122 fi 2.123 2.124 2.125 @@ -11159,17 +11175,20 @@ 2.126 else 2.127 # We're on a posix platform. Hooray! :) 2.128 path="$BOOT_JDK" 2.129 - 2.130 - if test ! -f "$path" && test ! -d "$path"; then 2.131 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.132 - fi 2.133 - 2.134 has_space=`$ECHO "$path" | $GREP " "` 2.135 if test "x$has_space" != x; then 2.136 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.137 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.138 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.139 fi 2.140 + 2.141 + # Use eval to expand a potential ~ 2.142 + eval path="$path" 2.143 + if test ! -f "$path" && test ! -d "$path"; then 2.144 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.145 + fi 2.146 + 2.147 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.148 fi 2.149 2.150 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.151 @@ -11488,17 +11507,20 @@ 2.152 else 2.153 # We're on a posix platform. Hooray! :) 2.154 path="$BOOT_JDK" 2.155 - 2.156 - if test ! -f "$path" && test ! -d "$path"; then 2.157 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.158 - fi 2.159 - 2.160 has_space=`$ECHO "$path" | $GREP " "` 2.161 if test "x$has_space" != x; then 2.162 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.163 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.164 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.165 fi 2.166 + 2.167 + # Use eval to expand a potential ~ 2.168 + eval path="$path" 2.169 + if test ! -f "$path" && test ! -d "$path"; then 2.170 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.171 + fi 2.172 + 2.173 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.174 fi 2.175 2.176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.177 @@ -11631,17 +11653,20 @@ 2.178 else 2.179 # We're on a posix platform. Hooray! :) 2.180 path="$JAVA_HOME_PROCESSED" 2.181 - 2.182 - if test ! -f "$path" && test ! -d "$path"; then 2.183 - as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5 2.184 - fi 2.185 - 2.186 has_space=`$ECHO "$path" | $GREP " "` 2.187 if test "x$has_space" != x; then 2.188 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&5 2.189 $as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&6;} 2.190 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.191 fi 2.192 + 2.193 + # Use eval to expand a potential ~ 2.194 + eval path="$path" 2.195 + if test ! -f "$path" && test ! -d "$path"; then 2.196 + as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5 2.197 + fi 2.198 + 2.199 + JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`" 2.200 fi 2.201 2.202 if test ! -d "$JAVA_HOME_PROCESSED"; then 2.203 @@ -11800,17 +11825,20 @@ 2.204 else 2.205 # We're on a posix platform. Hooray! :) 2.206 path="$BOOT_JDK" 2.207 - 2.208 - if test ! -f "$path" && test ! -d "$path"; then 2.209 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.210 - fi 2.211 - 2.212 has_space=`$ECHO "$path" | $GREP " "` 2.213 if test "x$has_space" != x; then 2.214 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.215 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.216 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.217 fi 2.218 + 2.219 + # Use eval to expand a potential ~ 2.220 + eval path="$path" 2.221 + if test ! -f "$path" && test ! -d "$path"; then 2.222 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.223 + fi 2.224 + 2.225 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.226 fi 2.227 2.228 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.229 @@ -11985,17 +12013,20 @@ 2.230 else 2.231 # We're on a posix platform. Hooray! :) 2.232 path="$BOOT_JDK" 2.233 - 2.234 - if test ! -f "$path" && test ! -d "$path"; then 2.235 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.236 - fi 2.237 - 2.238 has_space=`$ECHO "$path" | $GREP " "` 2.239 if test "x$has_space" != x; then 2.240 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.241 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.242 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.243 fi 2.244 + 2.245 + # Use eval to expand a potential ~ 2.246 + eval path="$path" 2.247 + if test ! -f "$path" && test ! -d "$path"; then 2.248 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.249 + fi 2.250 + 2.251 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.252 fi 2.253 2.254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.255 @@ -12310,17 +12341,20 @@ 2.256 else 2.257 # We're on a posix platform. Hooray! :) 2.258 path="$BOOT_JDK" 2.259 - 2.260 - if test ! -f "$path" && test ! -d "$path"; then 2.261 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.262 - fi 2.263 - 2.264 has_space=`$ECHO "$path" | $GREP " "` 2.265 if test "x$has_space" != x; then 2.266 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.267 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.268 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.269 fi 2.270 + 2.271 + # Use eval to expand a potential ~ 2.272 + eval path="$path" 2.273 + if test ! -f "$path" && test ! -d "$path"; then 2.274 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.275 + fi 2.276 + 2.277 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.278 fi 2.279 2.280 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.281 @@ -12522,17 +12556,20 @@ 2.282 else 2.283 # We're on a posix platform. Hooray! :) 2.284 path="$BOOT_JDK" 2.285 - 2.286 - if test ! -f "$path" && test ! -d "$path"; then 2.287 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.288 - fi 2.289 - 2.290 has_space=`$ECHO "$path" | $GREP " "` 2.291 if test "x$has_space" != x; then 2.292 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.293 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.294 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.295 fi 2.296 + 2.297 + # Use eval to expand a potential ~ 2.298 + eval path="$path" 2.299 + if test ! -f "$path" && test ! -d "$path"; then 2.300 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.301 + fi 2.302 + 2.303 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.304 fi 2.305 2.306 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.307 @@ -12699,17 +12736,20 @@ 2.308 else 2.309 # We're on a posix platform. Hooray! :) 2.310 path="$BOOT_JDK" 2.311 - 2.312 - if test ! -f "$path" && test ! -d "$path"; then 2.313 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.314 - fi 2.315 - 2.316 has_space=`$ECHO "$path" | $GREP " "` 2.317 if test "x$has_space" != x; then 2.318 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.319 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.320 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.321 fi 2.322 + 2.323 + # Use eval to expand a potential ~ 2.324 + eval path="$path" 2.325 + if test ! -f "$path" && test ! -d "$path"; then 2.326 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.327 + fi 2.328 + 2.329 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.330 fi 2.331 2.332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.333 @@ -12904,17 +12944,20 @@ 2.334 else 2.335 # We're on a posix platform. Hooray! :) 2.336 path="$BOOT_JDK" 2.337 - 2.338 - if test ! -f "$path" && test ! -d "$path"; then 2.339 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.340 - fi 2.341 - 2.342 has_space=`$ECHO "$path" | $GREP " "` 2.343 if test "x$has_space" != x; then 2.344 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.345 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.346 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.347 fi 2.348 + 2.349 + # Use eval to expand a potential ~ 2.350 + eval path="$path" 2.351 + if test ! -f "$path" && test ! -d "$path"; then 2.352 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.353 + fi 2.354 + 2.355 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.356 fi 2.357 2.358 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.359 @@ -13081,17 +13124,20 @@ 2.360 else 2.361 # We're on a posix platform. Hooray! :) 2.362 path="$BOOT_JDK" 2.363 - 2.364 - if test ! -f "$path" && test ! -d "$path"; then 2.365 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.366 - fi 2.367 - 2.368 has_space=`$ECHO "$path" | $GREP " "` 2.369 if test "x$has_space" != x; then 2.370 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.371 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.372 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.373 fi 2.374 + 2.375 + # Use eval to expand a potential ~ 2.376 + eval path="$path" 2.377 + if test ! -f "$path" && test ! -d "$path"; then 2.378 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.379 + fi 2.380 + 2.381 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.382 fi 2.383 2.384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.385 @@ -13286,17 +13332,20 @@ 2.386 else 2.387 # We're on a posix platform. Hooray! :) 2.388 path="$BOOT_JDK" 2.389 - 2.390 - if test ! -f "$path" && test ! -d "$path"; then 2.391 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.392 - fi 2.393 - 2.394 has_space=`$ECHO "$path" | $GREP " "` 2.395 if test "x$has_space" != x; then 2.396 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.397 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.398 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.399 fi 2.400 + 2.401 + # Use eval to expand a potential ~ 2.402 + eval path="$path" 2.403 + if test ! -f "$path" && test ! -d "$path"; then 2.404 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.405 + fi 2.406 + 2.407 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.408 fi 2.409 2.410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.411 @@ -13463,17 +13512,20 @@ 2.412 else 2.413 # We're on a posix platform. Hooray! :) 2.414 path="$BOOT_JDK" 2.415 - 2.416 - if test ! -f "$path" && test ! -d "$path"; then 2.417 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.418 - fi 2.419 - 2.420 has_space=`$ECHO "$path" | $GREP " "` 2.421 if test "x$has_space" != x; then 2.422 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.423 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.424 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.425 fi 2.426 + 2.427 + # Use eval to expand a potential ~ 2.428 + eval path="$path" 2.429 + if test ! -f "$path" && test ! -d "$path"; then 2.430 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.431 + fi 2.432 + 2.433 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.434 fi 2.435 2.436 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.437 @@ -13668,17 +13720,20 @@ 2.438 else 2.439 # We're on a posix platform. Hooray! :) 2.440 path="$BOOT_JDK" 2.441 - 2.442 - if test ! -f "$path" && test ! -d "$path"; then 2.443 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.444 - fi 2.445 - 2.446 has_space=`$ECHO "$path" | $GREP " "` 2.447 if test "x$has_space" != x; then 2.448 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.449 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.450 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.451 fi 2.452 + 2.453 + # Use eval to expand a potential ~ 2.454 + eval path="$path" 2.455 + if test ! -f "$path" && test ! -d "$path"; then 2.456 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.457 + fi 2.458 + 2.459 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.460 fi 2.461 2.462 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.463 @@ -13845,17 +13900,20 @@ 2.464 else 2.465 # We're on a posix platform. Hooray! :) 2.466 path="$BOOT_JDK" 2.467 - 2.468 - if test ! -f "$path" && test ! -d "$path"; then 2.469 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.470 - fi 2.471 - 2.472 has_space=`$ECHO "$path" | $GREP " "` 2.473 if test "x$has_space" != x; then 2.474 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.475 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.476 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.477 fi 2.478 + 2.479 + # Use eval to expand a potential ~ 2.480 + eval path="$path" 2.481 + if test ! -f "$path" && test ! -d "$path"; then 2.482 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.483 + fi 2.484 + 2.485 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.486 fi 2.487 2.488 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.489 @@ -14037,17 +14095,20 @@ 2.490 else 2.491 # We're on a posix platform. Hooray! :) 2.492 path="$BOOT_JDK" 2.493 - 2.494 - if test ! -f "$path" && test ! -d "$path"; then 2.495 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.496 - fi 2.497 - 2.498 has_space=`$ECHO "$path" | $GREP " "` 2.499 if test "x$has_space" != x; then 2.500 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.501 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.502 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.503 fi 2.504 + 2.505 + # Use eval to expand a potential ~ 2.506 + eval path="$path" 2.507 + if test ! -f "$path" && test ! -d "$path"; then 2.508 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.509 + fi 2.510 + 2.511 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.512 fi 2.513 2.514 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.515 @@ -14212,17 +14273,20 @@ 2.516 else 2.517 # We're on a posix platform. Hooray! :) 2.518 path="$BOOT_JDK" 2.519 - 2.520 - if test ! -f "$path" && test ! -d "$path"; then 2.521 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.522 - fi 2.523 - 2.524 has_space=`$ECHO "$path" | $GREP " "` 2.525 if test "x$has_space" != x; then 2.526 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.527 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.528 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.529 fi 2.530 + 2.531 + # Use eval to expand a potential ~ 2.532 + eval path="$path" 2.533 + if test ! -f "$path" && test ! -d "$path"; then 2.534 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.535 + fi 2.536 + 2.537 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.538 fi 2.539 2.540 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.541 @@ -14405,17 +14469,20 @@ 2.542 else 2.543 # We're on a posix platform. Hooray! :) 2.544 path="$BOOT_JDK" 2.545 - 2.546 - if test ! -f "$path" && test ! -d "$path"; then 2.547 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.548 - fi 2.549 - 2.550 has_space=`$ECHO "$path" | $GREP " "` 2.551 if test "x$has_space" != x; then 2.552 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.553 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.554 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.555 fi 2.556 + 2.557 + # Use eval to expand a potential ~ 2.558 + eval path="$path" 2.559 + if test ! -f "$path" && test ! -d "$path"; then 2.560 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.561 + fi 2.562 + 2.563 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.564 fi 2.565 2.566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.567 @@ -14580,17 +14647,20 @@ 2.568 else 2.569 # We're on a posix platform. Hooray! :) 2.570 path="$BOOT_JDK" 2.571 - 2.572 - if test ! -f "$path" && test ! -d "$path"; then 2.573 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.574 - fi 2.575 - 2.576 has_space=`$ECHO "$path" | $GREP " "` 2.577 if test "x$has_space" != x; then 2.578 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.579 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.580 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.581 fi 2.582 + 2.583 + # Use eval to expand a potential ~ 2.584 + eval path="$path" 2.585 + if test ! -f "$path" && test ! -d "$path"; then 2.586 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.587 + fi 2.588 + 2.589 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.590 fi 2.591 2.592 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.593 @@ -14772,17 +14842,20 @@ 2.594 else 2.595 # We're on a posix platform. Hooray! :) 2.596 path="$BOOT_JDK" 2.597 - 2.598 - if test ! -f "$path" && test ! -d "$path"; then 2.599 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.600 - fi 2.601 - 2.602 has_space=`$ECHO "$path" | $GREP " "` 2.603 if test "x$has_space" != x; then 2.604 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.605 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.606 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.607 fi 2.608 + 2.609 + # Use eval to expand a potential ~ 2.610 + eval path="$path" 2.611 + if test ! -f "$path" && test ! -d "$path"; then 2.612 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.613 + fi 2.614 + 2.615 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.616 fi 2.617 2.618 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.619 @@ -14947,17 +15020,20 @@ 2.620 else 2.621 # We're on a posix platform. Hooray! :) 2.622 path="$BOOT_JDK" 2.623 - 2.624 - if test ! -f "$path" && test ! -d "$path"; then 2.625 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.626 - fi 2.627 - 2.628 has_space=`$ECHO "$path" | $GREP " "` 2.629 if test "x$has_space" != x; then 2.630 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.631 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.632 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.633 fi 2.634 + 2.635 + # Use eval to expand a potential ~ 2.636 + eval path="$path" 2.637 + if test ! -f "$path" && test ! -d "$path"; then 2.638 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.639 + fi 2.640 + 2.641 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.642 fi 2.643 2.644 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.645 @@ -15140,17 +15216,20 @@ 2.646 else 2.647 # We're on a posix platform. Hooray! :) 2.648 path="$BOOT_JDK" 2.649 - 2.650 - if test ! -f "$path" && test ! -d "$path"; then 2.651 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.652 - fi 2.653 - 2.654 has_space=`$ECHO "$path" | $GREP " "` 2.655 if test "x$has_space" != x; then 2.656 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.657 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.658 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.659 fi 2.660 + 2.661 + # Use eval to expand a potential ~ 2.662 + eval path="$path" 2.663 + if test ! -f "$path" && test ! -d "$path"; then 2.664 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.665 + fi 2.666 + 2.667 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.668 fi 2.669 2.670 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.671 @@ -15315,17 +15394,20 @@ 2.672 else 2.673 # We're on a posix platform. Hooray! :) 2.674 path="$BOOT_JDK" 2.675 - 2.676 - if test ! -f "$path" && test ! -d "$path"; then 2.677 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.678 - fi 2.679 - 2.680 has_space=`$ECHO "$path" | $GREP " "` 2.681 if test "x$has_space" != x; then 2.682 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.683 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.684 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.685 fi 2.686 + 2.687 + # Use eval to expand a potential ~ 2.688 + eval path="$path" 2.689 + if test ! -f "$path" && test ! -d "$path"; then 2.690 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.691 + fi 2.692 + 2.693 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.694 fi 2.695 2.696 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.697 @@ -15489,17 +15571,20 @@ 2.698 else 2.699 # We're on a posix platform. Hooray! :) 2.700 path="$BOOT_JDK" 2.701 - 2.702 - if test ! -f "$path" && test ! -d "$path"; then 2.703 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.704 - fi 2.705 - 2.706 has_space=`$ECHO "$path" | $GREP " "` 2.707 if test "x$has_space" != x; then 2.708 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 2.709 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 2.710 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.711 fi 2.712 + 2.713 + # Use eval to expand a potential ~ 2.714 + eval path="$path" 2.715 + if test ! -f "$path" && test ! -d "$path"; then 2.716 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 2.717 + fi 2.718 + 2.719 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 2.720 fi 2.721 2.722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 2.723 @@ -16172,6 +16257,157 @@ 2.724 2.725 # Locate the actual tools 2.726 2.727 + 2.728 +# Check whether --with-jtreg was given. 2.729 +if test "${with_jtreg+set}" = set; then : 2.730 + withval=$with_jtreg; 2.731 +fi 2.732 + 2.733 + 2.734 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTReg Regression Test Harness" >&5 2.735 +$as_echo_n "checking for JTReg Regression Test Harness... " >&6; } 2.736 + 2.737 + if test "x$with_jtreg" != x; then 2.738 + JT_HOME="$with_jtreg" 2.739 + 2.740 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.741 + 2.742 + # Input might be given as Windows format, start by converting to 2.743 + # unix format. 2.744 + path="$JT_HOME" 2.745 + new_path=`$CYGPATH -u "$path"` 2.746 + 2.747 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 2.748 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 2.749 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 2.750 + # "foo.exe" is OK but "foo" is an error. 2.751 + # 2.752 + # This test is therefore slightly more accurate than "test -f" to check for file precense. 2.753 + # It is also a way to make sure we got the proper file name for the real test later on. 2.754 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 2.755 + if test "x$test_shortpath" = x; then 2.756 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5 2.757 +$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;} 2.758 + as_fn_error $? "Cannot locate the the path of JT_HOME" "$LINENO" 5 2.759 + fi 2.760 + 2.761 + # Call helper function which possibly converts this using DOS-style short mode. 2.762 + # If so, the updated path is stored in $new_path. 2.763 + 2.764 + input_path="$new_path" 2.765 + # Check if we need to convert this using DOS-style short mode. If the path 2.766 + # contains just simple characters, use it. Otherwise (spaces, weird characters), 2.767 + # take no chances and rewrite it. 2.768 + # Note: m4 eats our [], so we need to use [ and ] instead. 2.769 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 2.770 + if test "x$has_forbidden_chars" != x; then 2.771 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 2.772 + shortmode_path=`$CYGPATH -s -m -a "$input_path"` 2.773 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 2.774 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 2.775 + # Going to short mode and back again did indeed matter. Since short mode is 2.776 + # case insensitive, let's make it lowercase to improve readability. 2.777 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 2.778 + # Now convert it back to Unix-stile (cygpath) 2.779 + input_path=`$CYGPATH -u "$shortmode_path"` 2.780 + new_path="$input_path" 2.781 + fi 2.782 + fi 2.783 + 2.784 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 2.785 + if test "x$test_cygdrive_prefix" = x; then 2.786 + # As a simple fix, exclude /usr/bin since it's not a real path. 2.787 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 2.788 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to 2.789 + # a path prefixed by /cygdrive for fixpath to work. 2.790 + new_path="$CYGWIN_ROOT_PATH$input_path" 2.791 + fi 2.792 + fi 2.793 + 2.794 + 2.795 + if test "x$path" != "x$new_path"; then 2.796 + JT_HOME="$new_path" 2.797 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5 2.798 +$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;} 2.799 + fi 2.800 + 2.801 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.802 + 2.803 + path="$JT_HOME" 2.804 + has_colon=`$ECHO $path | $GREP ^.:` 2.805 + new_path="$path" 2.806 + if test "x$has_colon" = x; then 2.807 + # Not in mixed or Windows style, start by that. 2.808 + new_path=`cmd //c echo $path` 2.809 + fi 2.810 + 2.811 + 2.812 + input_path="$new_path" 2.813 + # Check if we need to convert this using DOS-style short mode. If the path 2.814 + # contains just simple characters, use it. Otherwise (spaces, weird characters), 2.815 + # take no chances and rewrite it. 2.816 + # Note: m4 eats our [], so we need to use [ and ] instead. 2.817 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 2.818 + if test "x$has_forbidden_chars" != x; then 2.819 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 2.820 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 2.821 + fi 2.822 + 2.823 + 2.824 + windows_path="$new_path" 2.825 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 2.826 + unix_path=`$CYGPATH -u "$windows_path"` 2.827 + new_path="$unix_path" 2.828 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 2.829 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 2.830 + new_path="$unix_path" 2.831 + fi 2.832 + 2.833 + if test "x$path" != "x$new_path"; then 2.834 + JT_HOME="$new_path" 2.835 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5 2.836 +$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;} 2.837 + fi 2.838 + 2.839 + # Save the first 10 bytes of this path to the storage, so fixpath can work. 2.840 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 2.841 + 2.842 + else 2.843 + # We're on a posix platform. Hooray! :) 2.844 + path="$JT_HOME" 2.845 + has_space=`$ECHO "$path" | $GREP " "` 2.846 + if test "x$has_space" != x; then 2.847 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5 2.848 +$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;} 2.849 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.850 + fi 2.851 + 2.852 + # Use eval to expand a potential ~ 2.853 + eval path="$path" 2.854 + if test ! -f "$path" && test ! -d "$path"; then 2.855 + as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5 2.856 + fi 2.857 + 2.858 + JT_HOME="`cd "$path"; $THEPWDCMD`" 2.859 + fi 2.860 + 2.861 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5 2.862 +$as_echo "$JT_HOME" >&6; } 2.863 + 2.864 + # jtreg win32 script works for everybody 2.865 + JTREGEXE="$JT_HOME/win32/bin/jtreg" 2.866 + if test ! -f "$JTREGEXE"; then 2.867 + as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5 2.868 + fi 2.869 + else 2.870 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 2.871 +$as_echo "no" >&6; } 2.872 + fi 2.873 + 2.874 + 2.875 + 2.876 + 2.877 + 2.878 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 2.879 2.880 # Store path to cygwin link.exe to help excluding it when searching for 2.881 @@ -17128,17 +17364,20 @@ 2.882 else 2.883 # We're on a posix platform. Hooray! :) 2.884 path="$MSVCR_DLL" 2.885 - 2.886 - if test ! -f "$path" && test ! -d "$path"; then 2.887 - as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5 2.888 - fi 2.889 - 2.890 has_space=`$ECHO "$path" | $GREP " "` 2.891 if test "x$has_space" != x; then 2.892 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5 2.893 $as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;} 2.894 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.895 fi 2.896 + 2.897 + # Use eval to expand a potential ~ 2.898 + eval path="$path" 2.899 + if test ! -f "$path" && test ! -d "$path"; then 2.900 + as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5 2.901 + fi 2.902 + 2.903 + MSVCR_DLL="`cd "$path"; $THEPWDCMD`" 2.904 fi 2.905 2.906 2.907 @@ -17282,17 +17521,20 @@ 2.908 else 2.909 # We're on a posix platform. Hooray! :) 2.910 path="$dxsdk_path" 2.911 - 2.912 - if test ! -f "$path" && test ! -d "$path"; then 2.913 - as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 2.914 - fi 2.915 - 2.916 has_space=`$ECHO "$path" | $GREP " "` 2.917 if test "x$has_space" != x; then 2.918 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5 2.919 $as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;} 2.920 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.921 fi 2.922 + 2.923 + # Use eval to expand a potential ~ 2.924 + eval path="$path" 2.925 + if test ! -f "$path" && test ! -d "$path"; then 2.926 + as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 2.927 + fi 2.928 + 2.929 + dxsdk_path="`cd "$path"; $THEPWDCMD`" 2.930 fi 2.931 2.932 2.933 @@ -17417,17 +17659,20 @@ 2.934 else 2.935 # We're on a posix platform. Hooray! :) 2.936 path="$DXSDK_LIB_PATH" 2.937 - 2.938 - if test ! -f "$path" && test ! -d "$path"; then 2.939 - as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 2.940 - fi 2.941 - 2.942 has_space=`$ECHO "$path" | $GREP " "` 2.943 if test "x$has_space" != x; then 2.944 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5 2.945 $as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;} 2.946 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.947 fi 2.948 + 2.949 + # Use eval to expand a potential ~ 2.950 + eval path="$path" 2.951 + if test ! -f "$path" && test ! -d "$path"; then 2.952 + as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 2.953 + fi 2.954 + 2.955 + DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`" 2.956 fi 2.957 2.958 2.959 @@ -17550,17 +17795,20 @@ 2.960 else 2.961 # We're on a posix platform. Hooray! :) 2.962 path="$DXSDK_INCLUDE_PATH" 2.963 - 2.964 - if test ! -f "$path" && test ! -d "$path"; then 2.965 - as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 2.966 - fi 2.967 - 2.968 has_space=`$ECHO "$path" | $GREP " "` 2.969 if test "x$has_space" != x; then 2.970 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5 2.971 $as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;} 2.972 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.973 fi 2.974 + 2.975 + # Use eval to expand a potential ~ 2.976 + eval path="$path" 2.977 + if test ! -f "$path" && test ! -d "$path"; then 2.978 + as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 2.979 + fi 2.980 + 2.981 + DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`" 2.982 fi 2.983 2.984 2.985 @@ -28239,6 +28487,8 @@ 2.986 2.987 fi 2.988 2.989 + 2.990 + 2.991 # Restore old path without tools dir 2.992 PATH="$OLD_PATH" 2.993 2.994 @@ -30868,17 +31118,20 @@ 2.995 else 2.996 # We're on a posix platform. Hooray! :) 2.997 path="$with_freetype" 2.998 - 2.999 - if test ! -f "$path" && test ! -d "$path"; then 2.1000 - as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5 2.1001 - fi 2.1002 - 2.1003 has_space=`$ECHO "$path" | $GREP " "` 2.1004 if test "x$has_space" != x; then 2.1005 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_freetype, which resolves as \"$path\", is invalid." >&5 2.1006 $as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is invalid." >&6;} 2.1007 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.1008 fi 2.1009 + 2.1010 + # Use eval to expand a potential ~ 2.1011 + eval path="$path" 2.1012 + if test ! -f "$path" && test ! -d "$path"; then 2.1013 + as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5 2.1014 + fi 2.1015 + 2.1016 + with_freetype="`cd "$path"; $THEPWDCMD`" 2.1017 fi 2.1018 2.1019 FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype" 2.1020 @@ -31167,17 +31420,20 @@ 2.1021 else 2.1022 # We're on a posix platform. Hooray! :) 2.1023 path="$FREETYPELOCATION" 2.1024 - 2.1025 - if test ! -f "$path" && test ! -d "$path"; then 2.1026 - as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5 2.1027 - fi 2.1028 - 2.1029 has_space=`$ECHO "$path" | $GREP " "` 2.1030 if test "x$has_space" != x; then 2.1031 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&5 2.1032 $as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&6;} 2.1033 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 2.1034 fi 2.1035 + 2.1036 + # Use eval to expand a potential ~ 2.1037 + eval path="$path" 2.1038 + if test ! -f "$path" && test ! -d "$path"; then 2.1039 + as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5 2.1040 + fi 2.1041 + 2.1042 + FREETYPELOCATION="`cd "$path"; $THEPWDCMD`" 2.1043 fi 2.1044 2.1045 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
3.1 --- a/common/autoconf/spec.gmk.in Wed May 22 17:26:31 2013 +0200 3.2 +++ b/common/autoconf/spec.gmk.in Tue May 28 08:50:52 2013 +0200 3.3 @@ -528,6 +528,8 @@ 3.4 OBJCOPY:=@OBJCOPY@ 3.5 SETFILE:=@SETFILE@ 3.6 XATTR:=@XATTR@ 3.7 +JT_HOME:=@JT_HOME@ 3.8 +JTREGEXE:=@JTREGEXE@ 3.9 3.10 FIXPATH:=@FIXPATH@ 3.11
4.1 --- a/common/autoconf/toolchain.m4 Wed May 22 17:26:31 2013 +0200 4.2 +++ b/common/autoconf/toolchain.m4 Tue May 28 08:50:52 2013 +0200 4.3 @@ -479,6 +479,8 @@ 4.4 BASIC_FIXUP_EXECUTABLE(LIPO) 4.5 fi 4.6 4.7 +TOOLCHAIN_SETUP_JTREG 4.8 + 4.9 # Restore old path without tools dir 4.10 PATH="$OLD_PATH" 4.11 ]) 4.12 @@ -1089,3 +1091,29 @@ 4.13 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false]) 4.14 AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG) 4.15 ]) 4.16 + 4.17 +# Setup the JTREG paths 4.18 +AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG], 4.19 +[ 4.20 + AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], 4.21 + [Regression Test Harness @<:@probed@:>@])]) 4.22 + 4.23 + AC_MSG_CHECKING([for JTReg Regression Test Harness]) 4.24 + 4.25 + if test "x$with_jtreg" != x; then 4.26 + JT_HOME="$with_jtreg" 4.27 + BASIC_FIXUP_PATH([JT_HOME]) 4.28 + AC_MSG_RESULT($JT_HOME) 4.29 + 4.30 + # jtreg win32 script works for everybody 4.31 + JTREGEXE="$JT_HOME/win32/bin/jtreg" 4.32 + if test ! -f "$JTREGEXE"; then 4.33 + AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE]) 4.34 + fi 4.35 + else 4.36 + AC_MSG_RESULT(no) 4.37 + fi 4.38 + 4.39 + AC_SUBST(JT_HOME) 4.40 + AC_SUBST(JTREGEXE) 4.41 +])
