Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 28 May 2013 17:57:40 -0700
- author
- katleman
- date
- Tue, 28 May 2013 17:57:40 -0700
- changeset 719
- 3a36c926a7aa
- parent 716
- f089df41bff5
- parent 718
- e7c09a983c3c
- child 720
- 46be9eb242d1
- child 724
- 33b6df33a2b7
- child 820
- 7dea0ce25bdc
Merge
1.1 --- a/common/autoconf/basics.m4 Thu May 23 10:47:32 2013 -0700 1.2 +++ b/common/autoconf/basics.m4 Tue May 28 17:57:40 2013 -0700 1.3 @@ -23,14 +23,23 @@ 1.4 # questions. 1.5 # 1.6 1.7 +# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) 1.8 +# If so, then append $1 to $2\ 1.9 +# Also set JVM_ARG_OK to true/false depending on outcome. 1.10 AC_DEFUN([ADD_JVM_ARG_IF_OK], 1.11 [ 1.12 - # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) 1.13 - # If so, then append $1 to $2 1.14 - FOUND_WARN=`$3 $1 -version 2>&1 | grep -i warn` 1.15 - FOUND_VERSION=`$3 $1 -version 2>&1 | grep " version \""` 1.16 + $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD 1.17 + $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD 1.18 + OUTPUT=`$3 $1 -version 2>&1` 1.19 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 1.20 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 1.21 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 1.22 $2="[$]$2 $1" 1.23 + JVM_ARG_OK=true 1.24 + else 1.25 + $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD 1.26 + $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD 1.27 + JVM_ARG_OK=false 1.28 fi 1.29 ]) 1.30 1.31 @@ -51,16 +60,19 @@ 1.32 else 1.33 # We're on a posix platform. Hooray! :) 1.34 path="[$]$1" 1.35 - 1.36 - if test ! -f "$path" && test ! -d "$path"; then 1.37 - AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) 1.38 - fi 1.39 - 1.40 has_space=`$ECHO "$path" | $GREP " "` 1.41 if test "x$has_space" != x; then 1.42 AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.]) 1.43 AC_MSG_ERROR([Spaces are not allowed in this path.]) 1.44 fi 1.45 + 1.46 + # Use eval to expand a potential ~ 1.47 + eval path="$path" 1.48 + if test ! -f "$path" && test ! -d "$path"; then 1.49 + AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) 1.50 + fi 1.51 + 1.52 + $1="`cd "$path"; $THEPWDCMD`" 1.53 fi 1.54 ]) 1.55
2.1 --- a/common/autoconf/build-performance.m4 Thu May 23 10:47:32 2013 -0700 2.2 +++ b/common/autoconf/build-performance.m4 Tue May 28 17:57:40 2013 -0700 2.3 @@ -278,60 +278,37 @@ 2.4 fi 2.5 AC_SUBST(SJAVAC_SERVER_JAVA) 2.6 2.7 -AC_ARG_WITH(sjavac-server-cores, [AS_HELP_STRING([--with-sjavac-server-cores], 2.8 - [use at most this number of concurrent threads on the sjavac server @<:@probed@:>@])]) 2.9 -if test "x$with_sjavac_server_cores" != x; then 2.10 - SJAVAC_SERVER_CORES="$with_sjavac_server_cores" 2.11 -else 2.12 - if test "$NUM_CORES" -gt 16; then 2.13 - # We set this arbitrary limit because we want to limit the heap 2.14 - # size of the javac server. 2.15 - # In the future we will make the javac compilers in the server 2.16 - # share more and more state, thus enabling us to use more and 2.17 - # more concurrent threads in the server. 2.18 - SJAVAC_SERVER_CORES="16" 2.19 - else 2.20 - SJAVAC_SERVER_CORES="$NUM_CORES" 2.21 +if test "$MEMORY_SIZE" -gt "2500"; then 2.22 + ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.23 + if test "$JVM_ARG_OK" = true; then 2.24 + JVM_64BIT=true 2.25 + JVM_ARG_OK=false 2.26 + fi 2.27 fi 2.28 2.29 +if test "$JVM_64BIT" = true; then 2.30 if test "$MEMORY_SIZE" -gt "17000"; then 2.31 - MAX_HEAP_MEM=10000 2.32 - ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.33 ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.34 - elif test "$MEMORY_SIZE" -gt "10000"; then 2.35 - MAX_HEAP_MEM=6000 2.36 - ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.37 + fi 2.38 + if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then 2.39 ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.40 - elif test "$MEMORY_SIZE" -gt "5000"; then 2.41 - MAX_HEAP_MEM=3000 2.42 - ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.43 + fi 2.44 + if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then 2.45 ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.46 - elif test "$MEMORY_SIZE" -gt "3800"; then 2.47 - MAX_HEAP_MEM=2500 2.48 + fi 2.49 + if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then 2.50 ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.51 - elif test "$MEMORY_SIZE" -gt "1900"; then 2.52 - MAX_HEAP_MEM=1200 2.53 - ADD_JVM_ARG_IF_OK([-Xms700M -Xmx1400M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.54 - elif test "$MEMORY_SIZE" -gt "1000"; then 2.55 - MAX_HEAP_MEM=900 2.56 - ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.57 - else 2.58 - MAX_HEAP_MEM=512 2.59 - ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.60 fi 2.61 - 2.62 - ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.63 - ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.64 - ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.65 - 2.66 - MAX_COMPILERS_IN_HEAP=`expr $MAX_HEAP_MEM / 501` 2.67 - if test "$SJAVAC_SERVER_CORES" -gt "$MAX_COMPILERS_IN_HEAP"; then 2.68 - AC_MSG_CHECKING([if number of server cores must be reduced]) 2.69 - SJAVAC_SERVER_CORES="$MAX_COMPILERS_IN_HEAP" 2.70 - AC_MSG_RESULT([yes, to $SJAVAC_SERVER_CORES with max heap size $MAX_HEAP_MEM MB]) 2.71 - fi 2.72 -fi 2.73 -AC_SUBST(SJAVAC_SERVER_CORES) 2.74 +fi 2.75 +if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then 2.76 + ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.77 +fi 2.78 +if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then 2.79 + ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.80 +fi 2.81 +if test "$JVM_ARG_OK" = false; then 2.82 + ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) 2.83 +fi 2.84 2.85 AC_MSG_CHECKING([whether to use sjavac]) 2.86 AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac],
3.1 --- a/common/autoconf/generated-configure.sh Thu May 23 10:47:32 2013 -0700 3.2 +++ b/common/autoconf/generated-configure.sh Tue May 28 17:57:40 2013 -0700 3.3 @@ -599,7 +599,6 @@ 3.4 USE_PRECOMPILED_HEADER 3.5 SJAVAC_SERVER_DIR 3.6 ENABLE_SJAVAC 3.7 -SJAVAC_SERVER_CORES 3.8 SJAVAC_SERVER_JAVA 3.9 JOBS 3.10 MEMORY_SIZE 3.11 @@ -682,6 +681,8 @@ 3.12 SHARED_LIBRARY 3.13 OBJ_SUFFIX 3.14 COMPILER_NAME 3.15 +JTREGEXE 3.16 +JT_HOME 3.17 LIPO 3.18 ac_ct_OBJDUMP 3.19 OBJDUMP 3.20 @@ -1005,6 +1006,7 @@ 3.21 with_dxsdk 3.22 with_dxsdk_lib 3.23 with_dxsdk_include 3.24 +with_jtreg 3.25 with_extra_cflags 3.26 with_extra_cxxflags 3.27 with_extra_ldflags 3.28 @@ -1025,7 +1027,6 @@ 3.29 with_memory_size 3.30 with_jobs 3.31 with_sjavac_server_java 3.32 -with_sjavac_server_cores 3.33 enable_sjavac 3.34 enable_precompiled_headers 3.35 enable_ccache 3.36 @@ -1764,6 +1765,7 @@ 3.37 [probed] 3.38 --with-dxsdk-include the DirectX SDK include directory (Windows only) 3.39 [probed] 3.40 + --with-jtreg Regression Test Harness [probed] 3.41 --with-extra-cflags extra flags to be used when compiling jdk c-files 3.42 --with-extra-cxxflags extra flags to be used when compiling jdk c++-files 3.43 --with-extra-ldflags extra flags to be used when linking jdk 3.44 @@ -1796,9 +1798,6 @@ 3.45 --with-sjavac-server-java 3.46 use this java binary for running the sjavac 3.47 background server [Boot JDK java] 3.48 - --with-sjavac-server-cores 3.49 - use at most this number of concurrent threads on the 3.50 - sjavac server [probed] 3.51 --with-ccache-dir where to store ccache files [~/.ccache] 3.52 3.53 Some influential environment variables: 3.54 @@ -3077,6 +3076,9 @@ 3.55 # questions. 3.56 # 3.57 3.58 +# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3) 3.59 +# If so, then append $1 to $2\ 3.60 +# Also set JVM_ARG_OK to true/false depending on outcome. 3.61 3.62 3.63 # This will make sure the given variable points to a full and proper 3.64 @@ -3725,6 +3727,9 @@ 3.65 3.66 3.67 3.68 +# Setup the JTREG paths 3.69 + 3.70 + 3.71 # 3.72 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 3.73 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.74 @@ -3775,7 +3780,7 @@ 3.75 #CUSTOM_AUTOCONF_INCLUDE 3.76 3.77 # Do not change or remove the following line, it is needed for consistency checks: 3.78 -DATE_WHEN_GENERATED=1367502949 3.79 +DATE_WHEN_GENERATED=1369723814 3.80 3.81 ############################################################################### 3.82 # 3.83 @@ -7389,17 +7394,20 @@ 3.84 else 3.85 # We're on a posix platform. Hooray! :) 3.86 path="$SRC_ROOT" 3.87 - 3.88 - if test ! -f "$path" && test ! -d "$path"; then 3.89 - as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 3.90 - fi 3.91 - 3.92 has_space=`$ECHO "$path" | $GREP " "` 3.93 if test "x$has_space" != x; then 3.94 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&5 3.95 $as_echo "$as_me: The path of SRC_ROOT, which resolves as \"$path\", is invalid." >&6;} 3.96 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.97 fi 3.98 + 3.99 + # Use eval to expand a potential ~ 3.100 + eval path="$path" 3.101 + if test ! -f "$path" && test ! -d "$path"; then 3.102 + as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 3.103 + fi 3.104 + 3.105 + SRC_ROOT="`cd "$path"; $THEPWDCMD`" 3.106 fi 3.107 3.108 3.109 @@ -7508,17 +7516,20 @@ 3.110 else 3.111 # We're on a posix platform. Hooray! :) 3.112 path="$CURDIR" 3.113 - 3.114 - if test ! -f "$path" && test ! -d "$path"; then 3.115 - as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5 3.116 - fi 3.117 - 3.118 has_space=`$ECHO "$path" | $GREP " "` 3.119 if test "x$has_space" != x; then 3.120 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CURDIR, which resolves as \"$path\", is invalid." >&5 3.121 $as_echo "$as_me: The path of CURDIR, which resolves as \"$path\", is invalid." >&6;} 3.122 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.123 fi 3.124 + 3.125 + # Use eval to expand a potential ~ 3.126 + eval path="$path" 3.127 + if test ! -f "$path" && test ! -d "$path"; then 3.128 + as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5 3.129 + fi 3.130 + 3.131 + CURDIR="`cd "$path"; $THEPWDCMD`" 3.132 fi 3.133 3.134 3.135 @@ -8104,17 +8115,20 @@ 3.136 else 3.137 # We're on a posix platform. Hooray! :) 3.138 path="$OUTPUT_ROOT" 3.139 - 3.140 - if test ! -f "$path" && test ! -d "$path"; then 3.141 - as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 3.142 - fi 3.143 - 3.144 has_space=`$ECHO "$path" | $GREP " "` 3.145 if test "x$has_space" != x; then 3.146 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&5 3.147 $as_echo "$as_me: The path of OUTPUT_ROOT, which resolves as \"$path\", is invalid." >&6;} 3.148 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.149 fi 3.150 + 3.151 + # Use eval to expand a potential ~ 3.152 + eval path="$path" 3.153 + if test ! -f "$path" && test ! -d "$path"; then 3.154 + as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5 3.155 + fi 3.156 + 3.157 + OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`" 3.158 fi 3.159 3.160 3.161 @@ -11161,17 +11175,20 @@ 3.162 else 3.163 # We're on a posix platform. Hooray! :) 3.164 path="$BOOT_JDK" 3.165 - 3.166 - if test ! -f "$path" && test ! -d "$path"; then 3.167 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.168 - fi 3.169 - 3.170 has_space=`$ECHO "$path" | $GREP " "` 3.171 if test "x$has_space" != x; then 3.172 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.173 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.174 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.175 fi 3.176 + 3.177 + # Use eval to expand a potential ~ 3.178 + eval path="$path" 3.179 + if test ! -f "$path" && test ! -d "$path"; then 3.180 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.181 + fi 3.182 + 3.183 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.184 fi 3.185 3.186 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.187 @@ -11490,17 +11507,20 @@ 3.188 else 3.189 # We're on a posix platform. Hooray! :) 3.190 path="$BOOT_JDK" 3.191 - 3.192 - if test ! -f "$path" && test ! -d "$path"; then 3.193 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.194 - fi 3.195 - 3.196 has_space=`$ECHO "$path" | $GREP " "` 3.197 if test "x$has_space" != x; then 3.198 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.199 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.200 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.201 fi 3.202 + 3.203 + # Use eval to expand a potential ~ 3.204 + eval path="$path" 3.205 + if test ! -f "$path" && test ! -d "$path"; then 3.206 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.207 + fi 3.208 + 3.209 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.210 fi 3.211 3.212 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.213 @@ -11633,17 +11653,20 @@ 3.214 else 3.215 # We're on a posix platform. Hooray! :) 3.216 path="$JAVA_HOME_PROCESSED" 3.217 - 3.218 - if test ! -f "$path" && test ! -d "$path"; then 3.219 - as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5 3.220 - fi 3.221 - 3.222 has_space=`$ECHO "$path" | $GREP " "` 3.223 if test "x$has_space" != x; then 3.224 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&5 3.225 $as_echo "$as_me: The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is invalid." >&6;} 3.226 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.227 fi 3.228 + 3.229 + # Use eval to expand a potential ~ 3.230 + eval path="$path" 3.231 + if test ! -f "$path" && test ! -d "$path"; then 3.232 + as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5 3.233 + fi 3.234 + 3.235 + JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`" 3.236 fi 3.237 3.238 if test ! -d "$JAVA_HOME_PROCESSED"; then 3.239 @@ -11802,17 +11825,20 @@ 3.240 else 3.241 # We're on a posix platform. Hooray! :) 3.242 path="$BOOT_JDK" 3.243 - 3.244 - if test ! -f "$path" && test ! -d "$path"; then 3.245 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.246 - fi 3.247 - 3.248 has_space=`$ECHO "$path" | $GREP " "` 3.249 if test "x$has_space" != x; then 3.250 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.251 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.252 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.253 fi 3.254 + 3.255 + # Use eval to expand a potential ~ 3.256 + eval path="$path" 3.257 + if test ! -f "$path" && test ! -d "$path"; then 3.258 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.259 + fi 3.260 + 3.261 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.262 fi 3.263 3.264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.265 @@ -11987,17 +12013,20 @@ 3.266 else 3.267 # We're on a posix platform. Hooray! :) 3.268 path="$BOOT_JDK" 3.269 - 3.270 - if test ! -f "$path" && test ! -d "$path"; then 3.271 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.272 - fi 3.273 - 3.274 has_space=`$ECHO "$path" | $GREP " "` 3.275 if test "x$has_space" != x; then 3.276 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.277 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.278 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.279 fi 3.280 + 3.281 + # Use eval to expand a potential ~ 3.282 + eval path="$path" 3.283 + if test ! -f "$path" && test ! -d "$path"; then 3.284 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.285 + fi 3.286 + 3.287 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.288 fi 3.289 3.290 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.291 @@ -12312,17 +12341,20 @@ 3.292 else 3.293 # We're on a posix platform. Hooray! :) 3.294 path="$BOOT_JDK" 3.295 - 3.296 - if test ! -f "$path" && test ! -d "$path"; then 3.297 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.298 - fi 3.299 - 3.300 has_space=`$ECHO "$path" | $GREP " "` 3.301 if test "x$has_space" != x; then 3.302 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.303 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.304 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.305 fi 3.306 + 3.307 + # Use eval to expand a potential ~ 3.308 + eval path="$path" 3.309 + if test ! -f "$path" && test ! -d "$path"; then 3.310 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.311 + fi 3.312 + 3.313 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.314 fi 3.315 3.316 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.317 @@ -12524,17 +12556,20 @@ 3.318 else 3.319 # We're on a posix platform. Hooray! :) 3.320 path="$BOOT_JDK" 3.321 - 3.322 - if test ! -f "$path" && test ! -d "$path"; then 3.323 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.324 - fi 3.325 - 3.326 has_space=`$ECHO "$path" | $GREP " "` 3.327 if test "x$has_space" != x; then 3.328 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.329 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.330 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.331 fi 3.332 + 3.333 + # Use eval to expand a potential ~ 3.334 + eval path="$path" 3.335 + if test ! -f "$path" && test ! -d "$path"; then 3.336 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.337 + fi 3.338 + 3.339 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.340 fi 3.341 3.342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.343 @@ -12701,17 +12736,20 @@ 3.344 else 3.345 # We're on a posix platform. Hooray! :) 3.346 path="$BOOT_JDK" 3.347 - 3.348 - if test ! -f "$path" && test ! -d "$path"; then 3.349 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.350 - fi 3.351 - 3.352 has_space=`$ECHO "$path" | $GREP " "` 3.353 if test "x$has_space" != x; then 3.354 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.355 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.356 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.357 fi 3.358 + 3.359 + # Use eval to expand a potential ~ 3.360 + eval path="$path" 3.361 + if test ! -f "$path" && test ! -d "$path"; then 3.362 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.363 + fi 3.364 + 3.365 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.366 fi 3.367 3.368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.369 @@ -12906,17 +12944,20 @@ 3.370 else 3.371 # We're on a posix platform. Hooray! :) 3.372 path="$BOOT_JDK" 3.373 - 3.374 - if test ! -f "$path" && test ! -d "$path"; then 3.375 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.376 - fi 3.377 - 3.378 has_space=`$ECHO "$path" | $GREP " "` 3.379 if test "x$has_space" != x; then 3.380 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.381 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.382 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.383 fi 3.384 + 3.385 + # Use eval to expand a potential ~ 3.386 + eval path="$path" 3.387 + if test ! -f "$path" && test ! -d "$path"; then 3.388 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.389 + fi 3.390 + 3.391 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.392 fi 3.393 3.394 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.395 @@ -13083,17 +13124,20 @@ 3.396 else 3.397 # We're on a posix platform. Hooray! :) 3.398 path="$BOOT_JDK" 3.399 - 3.400 - if test ! -f "$path" && test ! -d "$path"; then 3.401 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.402 - fi 3.403 - 3.404 has_space=`$ECHO "$path" | $GREP " "` 3.405 if test "x$has_space" != x; then 3.406 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.407 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.408 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.409 fi 3.410 + 3.411 + # Use eval to expand a potential ~ 3.412 + eval path="$path" 3.413 + if test ! -f "$path" && test ! -d "$path"; then 3.414 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.415 + fi 3.416 + 3.417 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.418 fi 3.419 3.420 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.421 @@ -13288,17 +13332,20 @@ 3.422 else 3.423 # We're on a posix platform. Hooray! :) 3.424 path="$BOOT_JDK" 3.425 - 3.426 - if test ! -f "$path" && test ! -d "$path"; then 3.427 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.428 - fi 3.429 - 3.430 has_space=`$ECHO "$path" | $GREP " "` 3.431 if test "x$has_space" != x; then 3.432 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.433 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.434 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.435 fi 3.436 + 3.437 + # Use eval to expand a potential ~ 3.438 + eval path="$path" 3.439 + if test ! -f "$path" && test ! -d "$path"; then 3.440 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.441 + fi 3.442 + 3.443 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.444 fi 3.445 3.446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.447 @@ -13465,17 +13512,20 @@ 3.448 else 3.449 # We're on a posix platform. Hooray! :) 3.450 path="$BOOT_JDK" 3.451 - 3.452 - if test ! -f "$path" && test ! -d "$path"; then 3.453 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.454 - fi 3.455 - 3.456 has_space=`$ECHO "$path" | $GREP " "` 3.457 if test "x$has_space" != x; then 3.458 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.459 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.460 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.461 fi 3.462 + 3.463 + # Use eval to expand a potential ~ 3.464 + eval path="$path" 3.465 + if test ! -f "$path" && test ! -d "$path"; then 3.466 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.467 + fi 3.468 + 3.469 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.470 fi 3.471 3.472 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.473 @@ -13670,17 +13720,20 @@ 3.474 else 3.475 # We're on a posix platform. Hooray! :) 3.476 path="$BOOT_JDK" 3.477 - 3.478 - if test ! -f "$path" && test ! -d "$path"; then 3.479 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.480 - fi 3.481 - 3.482 has_space=`$ECHO "$path" | $GREP " "` 3.483 if test "x$has_space" != x; then 3.484 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.485 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.486 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.487 fi 3.488 + 3.489 + # Use eval to expand a potential ~ 3.490 + eval path="$path" 3.491 + if test ! -f "$path" && test ! -d "$path"; then 3.492 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.493 + fi 3.494 + 3.495 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.496 fi 3.497 3.498 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.499 @@ -13847,17 +13900,20 @@ 3.500 else 3.501 # We're on a posix platform. Hooray! :) 3.502 path="$BOOT_JDK" 3.503 - 3.504 - if test ! -f "$path" && test ! -d "$path"; then 3.505 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.506 - fi 3.507 - 3.508 has_space=`$ECHO "$path" | $GREP " "` 3.509 if test "x$has_space" != x; then 3.510 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.511 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.512 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.513 fi 3.514 + 3.515 + # Use eval to expand a potential ~ 3.516 + eval path="$path" 3.517 + if test ! -f "$path" && test ! -d "$path"; then 3.518 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.519 + fi 3.520 + 3.521 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.522 fi 3.523 3.524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.525 @@ -14039,17 +14095,20 @@ 3.526 else 3.527 # We're on a posix platform. Hooray! :) 3.528 path="$BOOT_JDK" 3.529 - 3.530 - if test ! -f "$path" && test ! -d "$path"; then 3.531 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.532 - fi 3.533 - 3.534 has_space=`$ECHO "$path" | $GREP " "` 3.535 if test "x$has_space" != x; then 3.536 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.537 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.538 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.539 fi 3.540 + 3.541 + # Use eval to expand a potential ~ 3.542 + eval path="$path" 3.543 + if test ! -f "$path" && test ! -d "$path"; then 3.544 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.545 + fi 3.546 + 3.547 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.548 fi 3.549 3.550 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.551 @@ -14214,17 +14273,20 @@ 3.552 else 3.553 # We're on a posix platform. Hooray! :) 3.554 path="$BOOT_JDK" 3.555 - 3.556 - if test ! -f "$path" && test ! -d "$path"; then 3.557 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.558 - fi 3.559 - 3.560 has_space=`$ECHO "$path" | $GREP " "` 3.561 if test "x$has_space" != x; then 3.562 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.563 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.564 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.565 fi 3.566 + 3.567 + # Use eval to expand a potential ~ 3.568 + eval path="$path" 3.569 + if test ! -f "$path" && test ! -d "$path"; then 3.570 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.571 + fi 3.572 + 3.573 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.574 fi 3.575 3.576 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.577 @@ -14407,17 +14469,20 @@ 3.578 else 3.579 # We're on a posix platform. Hooray! :) 3.580 path="$BOOT_JDK" 3.581 - 3.582 - if test ! -f "$path" && test ! -d "$path"; then 3.583 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.584 - fi 3.585 - 3.586 has_space=`$ECHO "$path" | $GREP " "` 3.587 if test "x$has_space" != x; then 3.588 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.589 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.590 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.591 fi 3.592 + 3.593 + # Use eval to expand a potential ~ 3.594 + eval path="$path" 3.595 + if test ! -f "$path" && test ! -d "$path"; then 3.596 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.597 + fi 3.598 + 3.599 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.600 fi 3.601 3.602 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.603 @@ -14582,17 +14647,20 @@ 3.604 else 3.605 # We're on a posix platform. Hooray! :) 3.606 path="$BOOT_JDK" 3.607 - 3.608 - if test ! -f "$path" && test ! -d "$path"; then 3.609 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.610 - fi 3.611 - 3.612 has_space=`$ECHO "$path" | $GREP " "` 3.613 if test "x$has_space" != x; then 3.614 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.615 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.616 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.617 fi 3.618 + 3.619 + # Use eval to expand a potential ~ 3.620 + eval path="$path" 3.621 + if test ! -f "$path" && test ! -d "$path"; then 3.622 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.623 + fi 3.624 + 3.625 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.626 fi 3.627 3.628 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.629 @@ -14774,17 +14842,20 @@ 3.630 else 3.631 # We're on a posix platform. Hooray! :) 3.632 path="$BOOT_JDK" 3.633 - 3.634 - if test ! -f "$path" && test ! -d "$path"; then 3.635 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.636 - fi 3.637 - 3.638 has_space=`$ECHO "$path" | $GREP " "` 3.639 if test "x$has_space" != x; then 3.640 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.641 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.642 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.643 fi 3.644 + 3.645 + # Use eval to expand a potential ~ 3.646 + eval path="$path" 3.647 + if test ! -f "$path" && test ! -d "$path"; then 3.648 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.649 + fi 3.650 + 3.651 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.652 fi 3.653 3.654 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.655 @@ -14949,17 +15020,20 @@ 3.656 else 3.657 # We're on a posix platform. Hooray! :) 3.658 path="$BOOT_JDK" 3.659 - 3.660 - if test ! -f "$path" && test ! -d "$path"; then 3.661 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.662 - fi 3.663 - 3.664 has_space=`$ECHO "$path" | $GREP " "` 3.665 if test "x$has_space" != x; then 3.666 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.667 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.668 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.669 fi 3.670 + 3.671 + # Use eval to expand a potential ~ 3.672 + eval path="$path" 3.673 + if test ! -f "$path" && test ! -d "$path"; then 3.674 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.675 + fi 3.676 + 3.677 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.678 fi 3.679 3.680 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.681 @@ -15142,17 +15216,20 @@ 3.682 else 3.683 # We're on a posix platform. Hooray! :) 3.684 path="$BOOT_JDK" 3.685 - 3.686 - if test ! -f "$path" && test ! -d "$path"; then 3.687 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.688 - fi 3.689 - 3.690 has_space=`$ECHO "$path" | $GREP " "` 3.691 if test "x$has_space" != x; then 3.692 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.693 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.694 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.695 fi 3.696 + 3.697 + # Use eval to expand a potential ~ 3.698 + eval path="$path" 3.699 + if test ! -f "$path" && test ! -d "$path"; then 3.700 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.701 + fi 3.702 + 3.703 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.704 fi 3.705 3.706 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.707 @@ -15317,17 +15394,20 @@ 3.708 else 3.709 # We're on a posix platform. Hooray! :) 3.710 path="$BOOT_JDK" 3.711 - 3.712 - if test ! -f "$path" && test ! -d "$path"; then 3.713 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.714 - fi 3.715 - 3.716 has_space=`$ECHO "$path" | $GREP " "` 3.717 if test "x$has_space" != x; then 3.718 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.719 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.720 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.721 fi 3.722 + 3.723 + # Use eval to expand a potential ~ 3.724 + eval path="$path" 3.725 + if test ! -f "$path" && test ! -d "$path"; then 3.726 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.727 + fi 3.728 + 3.729 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.730 fi 3.731 3.732 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.733 @@ -15491,17 +15571,20 @@ 3.734 else 3.735 # We're on a posix platform. Hooray! :) 3.736 path="$BOOT_JDK" 3.737 - 3.738 - if test ! -f "$path" && test ! -d "$path"; then 3.739 - as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.740 - fi 3.741 - 3.742 has_space=`$ECHO "$path" | $GREP " "` 3.743 if test "x$has_space" != x; then 3.744 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&5 3.745 $as_echo "$as_me: The path of BOOT_JDK, which resolves as \"$path\", is invalid." >&6;} 3.746 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.747 fi 3.748 + 3.749 + # Use eval to expand a potential ~ 3.750 + eval path="$path" 3.751 + if test ! -f "$path" && test ! -d "$path"; then 3.752 + as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5 3.753 + fi 3.754 + 3.755 + BOOT_JDK="`cd "$path"; $THEPWDCMD`" 3.756 fi 3.757 3.758 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5 3.759 @@ -15705,73 +15788,115 @@ 3.760 3.761 # Minimum amount of heap memory. 3.762 3.763 - # Test if -Xms64M is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.764 - # If so, then append -Xms64M to boot_jdk_jvmargs 3.765 - FOUND_WARN=`$JAVA -Xms64M -version 2>&1 | grep -i warn` 3.766 - FOUND_VERSION=`$JAVA -Xms64M -version 2>&1 | grep " version \""` 3.767 + $ECHO "Check if jvm arg is ok: -Xms64M" >&5 3.768 + $ECHO "Command: $JAVA -Xms64M -version" >&5 3.769 + OUTPUT=`$JAVA -Xms64M -version 2>&1` 3.770 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.771 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.772 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.773 boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M" 3.774 + JVM_ARG_OK=true 3.775 + else 3.776 + $ECHO "Arg failed:" >&5 3.777 + $ECHO "$OUTPUT" >&5 3.778 + JVM_ARG_OK=false 3.779 fi 3.780 3.781 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 3.782 # Why does macosx need more heap? Its the huge JDK batch. 3.783 3.784 - # Test if -Xmx1600M is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.785 - # If so, then append -Xmx1600M to boot_jdk_jvmargs 3.786 - FOUND_WARN=`$JAVA -Xmx1600M -version 2>&1 | grep -i warn` 3.787 - FOUND_VERSION=`$JAVA -Xmx1600M -version 2>&1 | grep " version \""` 3.788 + $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5 3.789 + $ECHO "Command: $JAVA -Xmx1600M -version" >&5 3.790 + OUTPUT=`$JAVA -Xmx1600M -version 2>&1` 3.791 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.792 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.793 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.794 boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M" 3.795 - fi 3.796 - 3.797 - else 3.798 - 3.799 - # Test if -Xmx1100M is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.800 - # If so, then append -Xmx1100M to boot_jdk_jvmargs 3.801 - FOUND_WARN=`$JAVA -Xmx1100M -version 2>&1 | grep -i warn` 3.802 - FOUND_VERSION=`$JAVA -Xmx1100M -version 2>&1 | grep " version \""` 3.803 + JVM_ARG_OK=true 3.804 + else 3.805 + $ECHO "Arg failed:" >&5 3.806 + $ECHO "$OUTPUT" >&5 3.807 + JVM_ARG_OK=false 3.808 + fi 3.809 + 3.810 + else 3.811 + 3.812 + $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5 3.813 + $ECHO "Command: $JAVA -Xmx1100M -version" >&5 3.814 + OUTPUT=`$JAVA -Xmx1100M -version 2>&1` 3.815 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.816 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.817 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.818 boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M" 3.819 + JVM_ARG_OK=true 3.820 + else 3.821 + $ECHO "Arg failed:" >&5 3.822 + $ECHO "$OUTPUT" >&5 3.823 + JVM_ARG_OK=false 3.824 fi 3.825 3.826 fi 3.827 # When is adding -client something that speeds up the JVM? 3.828 # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA]) 3.829 3.830 - # Test if -XX:PermSize=32m is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.831 - # If so, then append -XX:PermSize=32m to boot_jdk_jvmargs 3.832 - FOUND_WARN=`$JAVA -XX:PermSize=32m -version 2>&1 | grep -i warn` 3.833 - FOUND_VERSION=`$JAVA -XX:PermSize=32m -version 2>&1 | grep " version \""` 3.834 + $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5 3.835 + $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5 3.836 + OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1` 3.837 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.838 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.839 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.840 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m" 3.841 - fi 3.842 - 3.843 - 3.844 - # Test if -XX:MaxPermSize=160m is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.845 - # If so, then append -XX:MaxPermSize=160m to boot_jdk_jvmargs 3.846 - FOUND_WARN=`$JAVA -XX:MaxPermSize=160m -version 2>&1 | grep -i warn` 3.847 - FOUND_VERSION=`$JAVA -XX:MaxPermSize=160m -version 2>&1 | grep " version \""` 3.848 + JVM_ARG_OK=true 3.849 + else 3.850 + $ECHO "Arg failed:" >&5 3.851 + $ECHO "$OUTPUT" >&5 3.852 + JVM_ARG_OK=false 3.853 + fi 3.854 + 3.855 + 3.856 + $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5 3.857 + $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5 3.858 + OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1` 3.859 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.860 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.861 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.862 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m" 3.863 - fi 3.864 - 3.865 - 3.866 - # Test if -XX:ThreadStackSize=$STACK_SIZE is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.867 - # If so, then append -XX:ThreadStackSize=$STACK_SIZE to boot_jdk_jvmargs 3.868 - FOUND_WARN=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep -i warn` 3.869 - FOUND_VERSION=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep " version \""` 3.870 + JVM_ARG_OK=true 3.871 + else 3.872 + $ECHO "Arg failed:" >&5 3.873 + $ECHO "$OUTPUT" >&5 3.874 + JVM_ARG_OK=false 3.875 + fi 3.876 + 3.877 + 3.878 + $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5 3.879 + $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5 3.880 + OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1` 3.881 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.882 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.883 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.884 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE" 3.885 + JVM_ARG_OK=true 3.886 + else 3.887 + $ECHO "Arg failed:" >&5 3.888 + $ECHO "$OUTPUT" >&5 3.889 + JVM_ARG_OK=false 3.890 fi 3.891 3.892 # Disable special log output when a debug build is used as Boot JDK... 3.893 3.894 - # Test if -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.895 - # If so, then append -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput to boot_jdk_jvmargs 3.896 - FOUND_WARN=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1 | grep -i warn` 3.897 - FOUND_VERSION=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1 | grep " version \""` 3.898 + $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5 3.899 + $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5 3.900 + OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1` 3.901 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.902 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.903 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.904 boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" 3.905 + JVM_ARG_OK=true 3.906 + else 3.907 + $ECHO "Arg failed:" >&5 3.908 + $ECHO "$OUTPUT" >&5 3.909 + JVM_ARG_OK=false 3.910 fi 3.911 3.912 fi 3.913 @@ -16132,6 +16257,157 @@ 3.914 3.915 # Locate the actual tools 3.916 3.917 + 3.918 +# Check whether --with-jtreg was given. 3.919 +if test "${with_jtreg+set}" = set; then : 3.920 + withval=$with_jtreg; 3.921 +fi 3.922 + 3.923 + 3.924 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTReg Regression Test Harness" >&5 3.925 +$as_echo_n "checking for JTReg Regression Test Harness... " >&6; } 3.926 + 3.927 + if test "x$with_jtreg" != x; then 3.928 + JT_HOME="$with_jtreg" 3.929 + 3.930 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.931 + 3.932 + # Input might be given as Windows format, start by converting to 3.933 + # unix format. 3.934 + path="$JT_HOME" 3.935 + new_path=`$CYGPATH -u "$path"` 3.936 + 3.937 + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are 3.938 + # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered 3.939 + # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then 3.940 + # "foo.exe" is OK but "foo" is an error. 3.941 + # 3.942 + # This test is therefore slightly more accurate than "test -f" to check for file precense. 3.943 + # It is also a way to make sure we got the proper file name for the real test later on. 3.944 + test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null` 3.945 + if test "x$test_shortpath" = x; then 3.946 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5 3.947 +$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;} 3.948 + as_fn_error $? "Cannot locate the the path of JT_HOME" "$LINENO" 5 3.949 + fi 3.950 + 3.951 + # Call helper function which possibly converts this using DOS-style short mode. 3.952 + # If so, the updated path is stored in $new_path. 3.953 + 3.954 + input_path="$new_path" 3.955 + # Check if we need to convert this using DOS-style short mode. If the path 3.956 + # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.957 + # take no chances and rewrite it. 3.958 + # Note: m4 eats our [], so we need to use [ and ] instead. 3.959 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]` 3.960 + if test "x$has_forbidden_chars" != x; then 3.961 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.962 + shortmode_path=`$CYGPATH -s -m -a "$input_path"` 3.963 + path_after_shortmode=`$CYGPATH -u "$shortmode_path"` 3.964 + if test "x$path_after_shortmode" != "x$input_to_shortpath"; then 3.965 + # Going to short mode and back again did indeed matter. Since short mode is 3.966 + # case insensitive, let's make it lowercase to improve readability. 3.967 + shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.968 + # Now convert it back to Unix-stile (cygpath) 3.969 + input_path=`$CYGPATH -u "$shortmode_path"` 3.970 + new_path="$input_path" 3.971 + fi 3.972 + fi 3.973 + 3.974 + test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/` 3.975 + if test "x$test_cygdrive_prefix" = x; then 3.976 + # As a simple fix, exclude /usr/bin since it's not a real path. 3.977 + if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then 3.978 + # The path is in a Cygwin special directory (e.g. /home). We need this converted to 3.979 + # a path prefixed by /cygdrive for fixpath to work. 3.980 + new_path="$CYGWIN_ROOT_PATH$input_path" 3.981 + fi 3.982 + fi 3.983 + 3.984 + 3.985 + if test "x$path" != "x$new_path"; then 3.986 + JT_HOME="$new_path" 3.987 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5 3.988 +$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;} 3.989 + fi 3.990 + 3.991 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.992 + 3.993 + path="$JT_HOME" 3.994 + has_colon=`$ECHO $path | $GREP ^.:` 3.995 + new_path="$path" 3.996 + if test "x$has_colon" = x; then 3.997 + # Not in mixed or Windows style, start by that. 3.998 + new_path=`cmd //c echo $path` 3.999 + fi 3.1000 + 3.1001 + 3.1002 + input_path="$new_path" 3.1003 + # Check if we need to convert this using DOS-style short mode. If the path 3.1004 + # contains just simple characters, use it. Otherwise (spaces, weird characters), 3.1005 + # take no chances and rewrite it. 3.1006 + # Note: m4 eats our [], so we need to use [ and ] instead. 3.1007 + has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]` 3.1008 + if test "x$has_forbidden_chars" != x; then 3.1009 + # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \) 3.1010 + new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 3.1011 + fi 3.1012 + 3.1013 + 3.1014 + windows_path="$new_path" 3.1015 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 3.1016 + unix_path=`$CYGPATH -u "$windows_path"` 3.1017 + new_path="$unix_path" 3.1018 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 3.1019 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 3.1020 + new_path="$unix_path" 3.1021 + fi 3.1022 + 3.1023 + if test "x$path" != "x$new_path"; then 3.1024 + JT_HOME="$new_path" 3.1025 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting JT_HOME to \"$new_path\"" >&5 3.1026 +$as_echo "$as_me: Rewriting JT_HOME to \"$new_path\"" >&6;} 3.1027 + fi 3.1028 + 3.1029 + # Save the first 10 bytes of this path to the storage, so fixpath can work. 3.1030 + all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}") 3.1031 + 3.1032 + else 3.1033 + # We're on a posix platform. Hooray! :) 3.1034 + path="$JT_HOME" 3.1035 + has_space=`$ECHO "$path" | $GREP " "` 3.1036 + if test "x$has_space" != x; then 3.1037 + { $as_echo "$as_me:${as_lineno-$LINENO}: The path of JT_HOME, which resolves as \"$path\", is invalid." >&5 3.1038 +$as_echo "$as_me: The path of JT_HOME, which resolves as \"$path\", is invalid." >&6;} 3.1039 + as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1040 + fi 3.1041 + 3.1042 + # Use eval to expand a potential ~ 3.1043 + eval path="$path" 3.1044 + if test ! -f "$path" && test ! -d "$path"; then 3.1045 + as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5 3.1046 + fi 3.1047 + 3.1048 + JT_HOME="`cd "$path"; $THEPWDCMD`" 3.1049 + fi 3.1050 + 3.1051 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5 3.1052 +$as_echo "$JT_HOME" >&6; } 3.1053 + 3.1054 + # jtreg win32 script works for everybody 3.1055 + JTREGEXE="$JT_HOME/win32/bin/jtreg" 3.1056 + if test ! -f "$JTREGEXE"; then 3.1057 + as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5 3.1058 + fi 3.1059 + else 3.1060 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 3.1061 +$as_echo "no" >&6; } 3.1062 + fi 3.1063 + 3.1064 + 3.1065 + 3.1066 + 3.1067 + 3.1068 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 3.1069 3.1070 # Store path to cygwin link.exe to help excluding it when searching for 3.1071 @@ -17088,17 +17364,20 @@ 3.1072 else 3.1073 # We're on a posix platform. Hooray! :) 3.1074 path="$MSVCR_DLL" 3.1075 - 3.1076 - if test ! -f "$path" && test ! -d "$path"; then 3.1077 - as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5 3.1078 - fi 3.1079 - 3.1080 has_space=`$ECHO "$path" | $GREP " "` 3.1081 if test "x$has_space" != x; then 3.1082 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&5 3.1083 $as_echo "$as_me: The path of MSVCR_DLL, which resolves as \"$path\", is invalid." >&6;} 3.1084 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1085 fi 3.1086 + 3.1087 + # Use eval to expand a potential ~ 3.1088 + eval path="$path" 3.1089 + if test ! -f "$path" && test ! -d "$path"; then 3.1090 + as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5 3.1091 + fi 3.1092 + 3.1093 + MSVCR_DLL="`cd "$path"; $THEPWDCMD`" 3.1094 fi 3.1095 3.1096 3.1097 @@ -17242,17 +17521,20 @@ 3.1098 else 3.1099 # We're on a posix platform. Hooray! :) 3.1100 path="$dxsdk_path" 3.1101 - 3.1102 - if test ! -f "$path" && test ! -d "$path"; then 3.1103 - as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 3.1104 - fi 3.1105 - 3.1106 has_space=`$ECHO "$path" | $GREP " "` 3.1107 if test "x$has_space" != x; then 3.1108 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&5 3.1109 $as_echo "$as_me: The path of dxsdk_path, which resolves as \"$path\", is invalid." >&6;} 3.1110 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1111 fi 3.1112 + 3.1113 + # Use eval to expand a potential ~ 3.1114 + eval path="$path" 3.1115 + if test ! -f "$path" && test ! -d "$path"; then 3.1116 + as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5 3.1117 + fi 3.1118 + 3.1119 + dxsdk_path="`cd "$path"; $THEPWDCMD`" 3.1120 fi 3.1121 3.1122 3.1123 @@ -17377,17 +17659,20 @@ 3.1124 else 3.1125 # We're on a posix platform. Hooray! :) 3.1126 path="$DXSDK_LIB_PATH" 3.1127 - 3.1128 - if test ! -f "$path" && test ! -d "$path"; then 3.1129 - as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.1130 - fi 3.1131 - 3.1132 has_space=`$ECHO "$path" | $GREP " "` 3.1133 if test "x$has_space" != x; then 3.1134 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&5 3.1135 $as_echo "$as_me: The path of DXSDK_LIB_PATH, which resolves as \"$path\", is invalid." >&6;} 3.1136 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1137 fi 3.1138 + 3.1139 + # Use eval to expand a potential ~ 3.1140 + eval path="$path" 3.1141 + if test ! -f "$path" && test ! -d "$path"; then 3.1142 + as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.1143 + fi 3.1144 + 3.1145 + DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`" 3.1146 fi 3.1147 3.1148 3.1149 @@ -17510,17 +17795,20 @@ 3.1150 else 3.1151 # We're on a posix platform. Hooray! :) 3.1152 path="$DXSDK_INCLUDE_PATH" 3.1153 - 3.1154 - if test ! -f "$path" && test ! -d "$path"; then 3.1155 - as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.1156 - fi 3.1157 - 3.1158 has_space=`$ECHO "$path" | $GREP " "` 3.1159 if test "x$has_space" != x; then 3.1160 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&5 3.1161 $as_echo "$as_me: The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is invalid." >&6;} 3.1162 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1163 fi 3.1164 + 3.1165 + # Use eval to expand a potential ~ 3.1166 + eval path="$path" 3.1167 + if test ! -f "$path" && test ! -d "$path"; then 3.1168 + as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5 3.1169 + fi 3.1170 + 3.1171 + DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`" 3.1172 fi 3.1173 3.1174 3.1175 @@ -28199,6 +28487,8 @@ 3.1176 3.1177 fi 3.1178 3.1179 + 3.1180 + 3.1181 # Restore old path without tools dir 3.1182 PATH="$OLD_PATH" 3.1183 3.1184 @@ -30828,17 +31118,20 @@ 3.1185 else 3.1186 # We're on a posix platform. Hooray! :) 3.1187 path="$with_freetype" 3.1188 - 3.1189 - if test ! -f "$path" && test ! -d "$path"; then 3.1190 - as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5 3.1191 - fi 3.1192 - 3.1193 has_space=`$ECHO "$path" | $GREP " "` 3.1194 if test "x$has_space" != x; then 3.1195 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of with_freetype, which resolves as \"$path\", is invalid." >&5 3.1196 $as_echo "$as_me: The path of with_freetype, which resolves as \"$path\", is invalid." >&6;} 3.1197 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1198 fi 3.1199 + 3.1200 + # Use eval to expand a potential ~ 3.1201 + eval path="$path" 3.1202 + if test ! -f "$path" && test ! -d "$path"; then 3.1203 + as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5 3.1204 + fi 3.1205 + 3.1206 + with_freetype="`cd "$path"; $THEPWDCMD`" 3.1207 fi 3.1208 3.1209 FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype" 3.1210 @@ -31127,17 +31420,20 @@ 3.1211 else 3.1212 # We're on a posix platform. Hooray! :) 3.1213 path="$FREETYPELOCATION" 3.1214 - 3.1215 - if test ! -f "$path" && test ! -d "$path"; then 3.1216 - as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5 3.1217 - fi 3.1218 - 3.1219 has_space=`$ECHO "$path" | $GREP " "` 3.1220 if test "x$has_space" != x; then 3.1221 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&5 3.1222 $as_echo "$as_me: The path of FREETYPELOCATION, which resolves as \"$path\", is invalid." >&6;} 3.1223 as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5 3.1224 fi 3.1225 + 3.1226 + # Use eval to expand a potential ~ 3.1227 + eval path="$path" 3.1228 + if test ! -f "$path" && test ! -d "$path"; then 3.1229 + as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5 3.1230 + fi 3.1231 + 3.1232 + FREETYPELOCATION="`cd "$path"; $THEPWDCMD`" 3.1233 fi 3.1234 3.1235 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5 3.1236 @@ -32664,192 +32960,183 @@ 3.1237 SJAVAC_SERVER_JAVA="" 3.1238 # Hotspot specific options. 3.1239 3.1240 - # Test if -verbosegc is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.1241 - # If so, then append -verbosegc to SJAVAC_SERVER_JAVA 3.1242 - FOUND_WARN=`$JAVA -verbosegc -version 2>&1 | grep -i warn` 3.1243 - FOUND_VERSION=`$JAVA -verbosegc -version 2>&1 | grep " version \""` 3.1244 + $ECHO "Check if jvm arg is ok: -verbosegc" >&5 3.1245 + $ECHO "Command: $JAVA -verbosegc -version" >&5 3.1246 + OUTPUT=`$JAVA -verbosegc -version 2>&1` 3.1247 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1248 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1249 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1250 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -verbosegc" 3.1251 + JVM_ARG_OK=true 3.1252 + else 3.1253 + $ECHO "Arg failed:" >&5 3.1254 + $ECHO "$OUTPUT" >&5 3.1255 + JVM_ARG_OK=false 3.1256 fi 3.1257 3.1258 # JRockit specific options. 3.1259 3.1260 - # Test if -Xverbose:gc is a valid argument to $JAVA (often is $JAVA passed as $JAVA) 3.1261 - # If so, then append -Xverbose:gc to SJAVAC_SERVER_JAVA 3.1262 - FOUND_WARN=`$JAVA -Xverbose:gc -version 2>&1 | grep -i warn` 3.1263 - FOUND_VERSION=`$JAVA -Xverbose:gc -version 2>&1 | grep " version \""` 3.1264 + $ECHO "Check if jvm arg is ok: -Xverbose:gc" >&5 3.1265 + $ECHO "Command: $JAVA -Xverbose:gc -version" >&5 3.1266 + OUTPUT=`$JAVA -Xverbose:gc -version 2>&1` 3.1267 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1268 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1269 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1270 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xverbose:gc" 3.1271 + JVM_ARG_OK=true 3.1272 + else 3.1273 + $ECHO "Arg failed:" >&5 3.1274 + $ECHO "$OUTPUT" >&5 3.1275 + JVM_ARG_OK=false 3.1276 fi 3.1277 3.1278 SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA" 3.1279 fi 3.1280 3.1281 3.1282 - 3.1283 -# Check whether --with-sjavac-server-cores was given. 3.1284 -if test "${with_sjavac_server_cores+set}" = set; then : 3.1285 - withval=$with_sjavac_server_cores; 3.1286 -fi 3.1287 - 3.1288 -if test "x$with_sjavac_server_cores" != x; then 3.1289 - SJAVAC_SERVER_CORES="$with_sjavac_server_cores" 3.1290 -else 3.1291 - if test "$NUM_CORES" -gt 16; then 3.1292 - # We set this arbitrary limit because we want to limit the heap 3.1293 - # size of the javac server. 3.1294 - # In the future we will make the javac compilers in the server 3.1295 - # share more and more state, thus enabling us to use more and 3.1296 - # more concurrent threads in the server. 3.1297 - SJAVAC_SERVER_CORES="16" 3.1298 - else 3.1299 - SJAVAC_SERVER_CORES="$NUM_CORES" 3.1300 - fi 3.1301 - 3.1302 - if test "$MEMORY_SIZE" -gt "17000"; then 3.1303 - MAX_HEAP_MEM=10000 3.1304 - 3.1305 - # Test if -d64 is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1306 - # If so, then append -d64 to SJAVAC_SERVER_JAVA 3.1307 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep -i warn` 3.1308 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep " version \""` 3.1309 +if test "$MEMORY_SIZE" -gt "2500"; then 3.1310 + 3.1311 + $ECHO "Check if jvm arg is ok: -d64" >&5 3.1312 + $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5 3.1313 + OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1` 3.1314 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1315 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1316 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1317 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64" 3.1318 - fi 3.1319 - 3.1320 - 3.1321 - # Test if -Xms10G -Xmx10G is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1322 - # If so, then append -Xms10G -Xmx10G to SJAVAC_SERVER_JAVA 3.1323 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1 | grep -i warn` 3.1324 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1 | grep " version \""` 3.1325 + JVM_ARG_OK=true 3.1326 + else 3.1327 + $ECHO "Arg failed:" >&5 3.1328 + $ECHO "$OUTPUT" >&5 3.1329 + JVM_ARG_OK=false 3.1330 + fi 3.1331 + 3.1332 + if test "$JVM_ARG_OK" = true; then 3.1333 + JVM_64BIT=true 3.1334 + JVM_ARG_OK=false 3.1335 + fi 3.1336 + fi 3.1337 + 3.1338 +if test "$JVM_64BIT" = true; then 3.1339 + if test "$MEMORY_SIZE" -gt "17000"; then 3.1340 + 3.1341 + $ECHO "Check if jvm arg is ok: -Xms10G -Xmx10G" >&5 3.1342 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version" >&5 3.1343 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G -version 2>&1` 3.1344 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1345 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1346 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1347 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms10G -Xmx10G" 3.1348 - fi 3.1349 - 3.1350 - elif test "$MEMORY_SIZE" -gt "10000"; then 3.1351 - MAX_HEAP_MEM=6000 3.1352 - 3.1353 - # Test if -d64 is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1354 - # If so, then append -d64 to SJAVAC_SERVER_JAVA 3.1355 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep -i warn` 3.1356 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep " version \""` 3.1357 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1358 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64" 3.1359 - fi 3.1360 - 3.1361 - 3.1362 - # Test if -Xms6G -Xmx6G is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1363 - # If so, then append -Xms6G -Xmx6G to SJAVAC_SERVER_JAVA 3.1364 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1 | grep -i warn` 3.1365 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1 | grep " version \""` 3.1366 + JVM_ARG_OK=true 3.1367 + else 3.1368 + $ECHO "Arg failed:" >&5 3.1369 + $ECHO "$OUTPUT" >&5 3.1370 + JVM_ARG_OK=false 3.1371 + fi 3.1372 + 3.1373 + fi 3.1374 + if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then 3.1375 + 3.1376 + $ECHO "Check if jvm arg is ok: -Xms6G -Xmx6G" >&5 3.1377 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version" >&5 3.1378 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G -version 2>&1` 3.1379 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1380 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1381 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1382 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms6G -Xmx6G" 3.1383 - fi 3.1384 - 3.1385 - elif test "$MEMORY_SIZE" -gt "5000"; then 3.1386 - MAX_HEAP_MEM=3000 3.1387 - 3.1388 - # Test if -d64 is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1389 - # If so, then append -d64 to SJAVAC_SERVER_JAVA 3.1390 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep -i warn` 3.1391 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1 | grep " version \""` 3.1392 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1393 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64" 3.1394 - fi 3.1395 - 3.1396 - 3.1397 - # Test if -Xms1G -Xmx3G is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1398 - # If so, then append -Xms1G -Xmx3G to SJAVAC_SERVER_JAVA 3.1399 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1 | grep -i warn` 3.1400 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1 | grep " version \""` 3.1401 + JVM_ARG_OK=true 3.1402 + else 3.1403 + $ECHO "Arg failed:" >&5 3.1404 + $ECHO "$OUTPUT" >&5 3.1405 + JVM_ARG_OK=false 3.1406 + fi 3.1407 + 3.1408 + fi 3.1409 + if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then 3.1410 + 3.1411 + $ECHO "Check if jvm arg is ok: -Xms1G -Xmx3G" >&5 3.1412 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version" >&5 3.1413 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G -version 2>&1` 3.1414 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1415 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1416 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1417 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx3G" 3.1418 - fi 3.1419 - 3.1420 - elif test "$MEMORY_SIZE" -gt "3800"; then 3.1421 - MAX_HEAP_MEM=2500 3.1422 - 3.1423 - # Test if -Xms1G -Xmx2500M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1424 - # If so, then append -Xms1G -Xmx2500M to SJAVAC_SERVER_JAVA 3.1425 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1 | grep -i warn` 3.1426 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1 | grep " version \""` 3.1427 + JVM_ARG_OK=true 3.1428 + else 3.1429 + $ECHO "Arg failed:" >&5 3.1430 + $ECHO "$OUTPUT" >&5 3.1431 + JVM_ARG_OK=false 3.1432 + fi 3.1433 + 3.1434 + fi 3.1435 + if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then 3.1436 + 3.1437 + $ECHO "Check if jvm arg is ok: -Xms1G -Xmx2500M" >&5 3.1438 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version" >&5 3.1439 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M -version 2>&1` 3.1440 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1441 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1442 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1443 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1G -Xmx2500M" 3.1444 - fi 3.1445 - 3.1446 - elif test "$MEMORY_SIZE" -gt "1900"; then 3.1447 - MAX_HEAP_MEM=1200 3.1448 - 3.1449 - # Test if -Xms700M -Xmx1400M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1450 - # If so, then append -Xms700M -Xmx1400M to SJAVAC_SERVER_JAVA 3.1451 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms700M -Xmx1400M -version 2>&1 | grep -i warn` 3.1452 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms700M -Xmx1400M -version 2>&1 | grep " version \""` 3.1453 + JVM_ARG_OK=true 3.1454 + else 3.1455 + $ECHO "Arg failed:" >&5 3.1456 + $ECHO "$OUTPUT" >&5 3.1457 + JVM_ARG_OK=false 3.1458 + fi 3.1459 + 3.1460 + fi 3.1461 +fi 3.1462 +if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then 3.1463 + 3.1464 + $ECHO "Check if jvm arg is ok: -Xms1000M -Xmx1500M" >&5 3.1465 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version" >&5 3.1466 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M -version 2>&1` 3.1467 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1468 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1469 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1470 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms700M -Xmx1400M" 3.1471 - fi 3.1472 - 3.1473 - elif test "$MEMORY_SIZE" -gt "1000"; then 3.1474 - MAX_HEAP_MEM=900 3.1475 - 3.1476 - # Test if -Xms400M -Xmx1100M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1477 - # If so, then append -Xms400M -Xmx1100M to SJAVAC_SERVER_JAVA 3.1478 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1 | grep -i warn` 3.1479 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1 | grep " version \""` 3.1480 + SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms1000M -Xmx1500M" 3.1481 + JVM_ARG_OK=true 3.1482 + else 3.1483 + $ECHO "Arg failed:" >&5 3.1484 + $ECHO "$OUTPUT" >&5 3.1485 + JVM_ARG_OK=false 3.1486 + fi 3.1487 + 3.1488 +fi 3.1489 +if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then 3.1490 + 3.1491 + $ECHO "Check if jvm arg is ok: -Xms400M -Xmx1100M" >&5 3.1492 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version" >&5 3.1493 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M -version 2>&1` 3.1494 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1495 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1496 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1497 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms400M -Xmx1100M" 3.1498 - fi 3.1499 - 3.1500 - else 3.1501 - MAX_HEAP_MEM=512 3.1502 - 3.1503 - # Test if -Xms256M -Xmx512M is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1504 - # If so, then append -Xms256M -Xmx512M to SJAVAC_SERVER_JAVA 3.1505 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1 | grep -i warn` 3.1506 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1 | grep " version \""` 3.1507 + JVM_ARG_OK=true 3.1508 + else 3.1509 + $ECHO "Arg failed:" >&5 3.1510 + $ECHO "$OUTPUT" >&5 3.1511 + JVM_ARG_OK=false 3.1512 + fi 3.1513 + 3.1514 +fi 3.1515 +if test "$JVM_ARG_OK" = false; then 3.1516 + 3.1517 + $ECHO "Check if jvm arg is ok: -Xms256M -Xmx512M" >&5 3.1518 + $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version" >&5 3.1519 + OUTPUT=`$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M -version 2>&1` 3.1520 + FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` 3.1521 + FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` 3.1522 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1523 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms256M -Xmx512M" 3.1524 - fi 3.1525 - 3.1526 - fi 3.1527 - 3.1528 - 3.1529 - # Test if -XX:PermSize=32m is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1530 - # If so, then append -XX:PermSize=32m to SJAVAC_SERVER_JAVA 3.1531 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -XX:PermSize=32m -version 2>&1 | grep -i warn` 3.1532 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -XX:PermSize=32m -version 2>&1 | grep " version \""` 3.1533 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1534 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -XX:PermSize=32m" 3.1535 - fi 3.1536 - 3.1537 - 3.1538 - # Test if -XX:MaxPermSize=160m is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1539 - # If so, then append -XX:MaxPermSize=160m to SJAVAC_SERVER_JAVA 3.1540 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -XX:MaxPermSize=160m -version 2>&1 | grep -i warn` 3.1541 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -XX:MaxPermSize=160m -version 2>&1 | grep " version \""` 3.1542 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1543 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -XX:MaxPermSize=160m" 3.1544 - fi 3.1545 - 3.1546 - 3.1547 - # Test if -XX:ThreadStackSize=$STACK_SIZE is a valid argument to $SJAVAC_SERVER_JAVA (often is $JAVA passed as $SJAVAC_SERVER_JAVA) 3.1548 - # If so, then append -XX:ThreadStackSize=$STACK_SIZE to SJAVAC_SERVER_JAVA 3.1549 - FOUND_WARN=`$SJAVAC_SERVER_JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep -i warn` 3.1550 - FOUND_VERSION=`$SJAVAC_SERVER_JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1 | grep " version \""` 3.1551 - if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then 3.1552 - SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -XX:ThreadStackSize=$STACK_SIZE" 3.1553 - fi 3.1554 - 3.1555 - 3.1556 - MAX_COMPILERS_IN_HEAP=`expr $MAX_HEAP_MEM / 501` 3.1557 - if test "$SJAVAC_SERVER_CORES" -gt "$MAX_COMPILERS_IN_HEAP"; then 3.1558 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if number of server cores must be reduced" >&5 3.1559 -$as_echo_n "checking if number of server cores must be reduced... " >&6; } 3.1560 - SJAVAC_SERVER_CORES="$MAX_COMPILERS_IN_HEAP" 3.1561 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, to $SJAVAC_SERVER_CORES with max heap size $MAX_HEAP_MEM MB" >&5 3.1562 -$as_echo "yes, to $SJAVAC_SERVER_CORES with max heap size $MAX_HEAP_MEM MB" >&6; } 3.1563 - fi 3.1564 -fi 3.1565 - 3.1566 + JVM_ARG_OK=true 3.1567 + else 3.1568 + $ECHO "Arg failed:" >&5 3.1569 + $ECHO "$OUTPUT" >&5 3.1570 + JVM_ARG_OK=false 3.1571 + fi 3.1572 + 3.1573 +fi 3.1574 3.1575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use sjavac" >&5 3.1576 $as_echo_n "checking whether to use sjavac... " >&6; }
4.1 --- a/common/autoconf/spec.gmk.in Thu May 23 10:47:32 2013 -0700 4.2 +++ b/common/autoconf/spec.gmk.in Tue May 28 17:57:40 2013 -0700 4.3 @@ -528,6 +528,8 @@ 4.4 OBJCOPY:=@OBJCOPY@ 4.5 SETFILE:=@SETFILE@ 4.6 XATTR:=@XATTR@ 4.7 +JT_HOME:=@JT_HOME@ 4.8 +JTREGEXE:=@JTREGEXE@ 4.9 4.10 FIXPATH:=@FIXPATH@ 4.11
5.1 --- a/common/autoconf/toolchain.m4 Thu May 23 10:47:32 2013 -0700 5.2 +++ b/common/autoconf/toolchain.m4 Tue May 28 17:57:40 2013 -0700 5.3 @@ -479,6 +479,8 @@ 5.4 BASIC_FIXUP_EXECUTABLE(LIPO) 5.5 fi 5.6 5.7 +TOOLCHAIN_SETUP_JTREG 5.8 + 5.9 # Restore old path without tools dir 5.10 PATH="$OLD_PATH" 5.11 ]) 5.12 @@ -1089,3 +1091,29 @@ 5.13 [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false]) 5.14 AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG) 5.15 ]) 5.16 + 5.17 +# Setup the JTREG paths 5.18 +AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG], 5.19 +[ 5.20 + AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], 5.21 + [Regression Test Harness @<:@probed@:>@])]) 5.22 + 5.23 + AC_MSG_CHECKING([for JTReg Regression Test Harness]) 5.24 + 5.25 + if test "x$with_jtreg" != x; then 5.26 + JT_HOME="$with_jtreg" 5.27 + BASIC_FIXUP_PATH([JT_HOME]) 5.28 + AC_MSG_RESULT($JT_HOME) 5.29 + 5.30 + # jtreg win32 script works for everybody 5.31 + JTREGEXE="$JT_HOME/win32/bin/jtreg" 5.32 + if test ! -f "$JTREGEXE"; then 5.33 + AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE]) 5.34 + fi 5.35 + else 5.36 + AC_MSG_RESULT(no) 5.37 + fi 5.38 + 5.39 + AC_SUBST(JT_HOME) 5.40 + AC_SUBST(JTREGEXE) 5.41 +])
