1.1 --- a/common/autoconf/generated-configure.sh Tue Jun 04 00:12:51 2013 -0400
1.2 +++ b/common/autoconf/generated-configure.sh Tue Jun 04 15:54:46 2013 -0700
1.3 @@ -681,8 +681,8 @@
1.4 SHARED_LIBRARY
1.5 OBJ_SUFFIX
1.6 COMPILER_NAME
1.7 +JT_HOME
1.8 JTREGEXE
1.9 -JT_HOME
1.10 LIPO
1.11 ac_ct_OBJDUMP
1.12 OBJDUMP
1.13 @@ -797,6 +797,7 @@
1.14 OS_VERSION_MINOR
1.15 OS_VERSION_MAJOR
1.16 PKG_CONFIG
1.17 +CODESIGN
1.18 XATTR
1.19 TIME
1.20 STAT
1.21 @@ -900,7 +901,6 @@
1.22 SORT
1.23 SH
1.24 RM
1.25 -THEPWDCMD
1.26 PRINTF
1.27 MV
1.28 MKTEMP
1.29 @@ -988,6 +988,7 @@
1.30 with_cacerts_file
1.31 enable_unlimited_crypto
1.32 with_milestone
1.33 +with_update_version
1.34 with_build_number
1.35 with_user_release_suffix
1.36 with_boot_jdk
1.37 @@ -1727,6 +1728,7 @@
1.38 group
1.39 --with-cacerts-file specify alternative cacerts file
1.40 --with-milestone Set milestone value for build [internal]
1.41 + --with-update-version Set update version value for build [b00]
1.42 --with-build-number Set build number value for build [b00]
1.43 --with-user-release-suffix
1.44 Add a custom string to the version string if build
1.45 @@ -3780,7 +3782,7 @@
1.46 #CUSTOM_AUTOCONF_INCLUDE
1.47
1.48 # Do not change or remove the following line, it is needed for consistency checks:
1.49 -DATE_WHEN_GENERATED=1369764185
1.50 +DATE_WHEN_GENERATED=1370334570
1.51
1.52 ###############################################################################
1.53 #
1.54 @@ -5169,65 +5171,6 @@
1.55
1.56
1.57
1.58 - for ac_prog in pwd
1.59 -do
1.60 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.61 -set dummy $ac_prog; ac_word=$2
1.62 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.63 -$as_echo_n "checking for $ac_word... " >&6; }
1.64 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
1.65 - $as_echo_n "(cached) " >&6
1.66 -else
1.67 - case $THEPWDCMD in
1.68 - [\\/]* | ?:[\\/]*)
1.69 - ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
1.70 - ;;
1.71 - *)
1.72 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.73 -for as_dir in $PATH
1.74 -do
1.75 - IFS=$as_save_IFS
1.76 - test -z "$as_dir" && as_dir=.
1.77 - for ac_exec_ext in '' $ac_executable_extensions; do
1.78 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.79 - ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
1.80 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.81 - break 2
1.82 - fi
1.83 -done
1.84 - done
1.85 -IFS=$as_save_IFS
1.86 -
1.87 - ;;
1.88 -esac
1.89 -fi
1.90 -THEPWDCMD=$ac_cv_path_THEPWDCMD
1.91 -if test -n "$THEPWDCMD"; then
1.92 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
1.93 -$as_echo "$THEPWDCMD" >&6; }
1.94 -else
1.95 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.96 -$as_echo "no" >&6; }
1.97 -fi
1.98 -
1.99 -
1.100 - test -n "$THEPWDCMD" && break
1.101 -done
1.102 -
1.103 -
1.104 - if test "x$THEPWDCMD" = x; then
1.105 - if test "xpwd" = x; then
1.106 - PROG_NAME=thepwdcmd
1.107 - else
1.108 - PROG_NAME=pwd
1.109 - fi
1.110 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.111 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.112 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.113 - fi
1.114 -
1.115 -
1.116 -
1.117 for ac_prog in rm
1.118 do
1.119 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.120 @@ -6426,6 +6369,10 @@
1.121 # Always force rm.
1.122 RM="$RM -f"
1.123
1.124 +# pwd behaves differently on various platforms and some don't support the -L flag.
1.125 +# Always use the bash builtin pwd to get uniform behavior.
1.126 +THEPWDCMD=pwd
1.127 +
1.128 # These are not required on all platforms
1.129 # Extract the first word of "cygpath", so it can be a program name with args.
1.130 set dummy cygpath; ac_word=$2
1.131 @@ -7133,65 +7080,17 @@
1.132
1.133 # Locate the directory of this script.
1.134 SCRIPT="$0"
1.135 -
1.136 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.137 - # Follow a chain of symbolic links. Use readlink
1.138 - # where it exists, else fall back to horribly
1.139 - # complicated shell code.
1.140 - if test "x$READLINK_TESTED" != yes; then
1.141 - # On MacOSX there is a readlink tool with a different
1.142 - # purpose than the GNU readlink tool. Check the found readlink.
1.143 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.144 - if test "x$ISGNU" = x; then
1.145 - # A readlink that we do not know how to use.
1.146 - # Are there other non-GNU readlinks out there?
1.147 - READLINK_TESTED=yes
1.148 - READLINK=
1.149 - fi
1.150 - fi
1.151 -
1.152 - if test "x$READLINK" != x; then
1.153 - SCRIPT=`$READLINK -f $SCRIPT`
1.154 - else
1.155 - # Save the current directory for restoring afterwards
1.156 - STARTDIR=$PWD
1.157 - COUNTER=0
1.158 - sym_link_dir=`$DIRNAME $SCRIPT`
1.159 - sym_link_file=`$BASENAME $SCRIPT`
1.160 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.161 - cd $sym_link_dir
1.162 - cd `$THEPWDCMD`
1.163 - sym_link_dir=`$THEPWDCMD`
1.164 - # Resolve file symlinks
1.165 - while test $COUNTER -lt 20; do
1.166 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.167 - if test "x$ISLINK" == x; then
1.168 - # This is not a symbolic link! We are done!
1.169 - break
1.170 - fi
1.171 - # Again resolve directory symlinks since the target of the just found
1.172 - # link could be in a different directory
1.173 - cd `$DIRNAME $ISLINK`
1.174 - sym_link_dir=`$THEPWDCMD`
1.175 - sym_link_file=`$BASENAME $ISLINK`
1.176 - let COUNTER=COUNTER+1
1.177 - done
1.178 - cd $STARTDIR
1.179 - SCRIPT=$sym_link_dir/$sym_link_file
1.180 - fi
1.181 - fi
1.182 -
1.183 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
1.184 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
1.185
1.186 # Where is the source? It is located two levels above the configure script.
1.187 CURDIR="$PWD"
1.188 cd "$AUTOCONF_DIR/../.."
1.189 -SRC_ROOT="`$THEPWDCMD`"
1.190 +SRC_ROOT="`$THEPWDCMD -L`"
1.191
1.192 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.193 PATH_SEP=";"
1.194
1.195 - SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
1.196 + SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
1.197 if test $SRC_ROOT_LENGTH -gt 100; then
1.198 as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
1.199 fi
1.200 @@ -7407,7 +7306,7 @@
1.201 as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
1.202 fi
1.203
1.204 - SRC_ROOT="`cd "$path"; $THEPWDCMD`"
1.205 + SRC_ROOT="`cd "$path"; $THEPWDCMD -L`"
1.206 fi
1.207
1.208
1.209 @@ -7529,7 +7428,7 @@
1.210 as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.211 fi
1.212
1.213 - CURDIR="`cd "$path"; $THEPWDCMD`"
1.214 + CURDIR="`cd "$path"; $THEPWDCMD -L`"
1.215 fi
1.216
1.217
1.218 @@ -7900,60 +7799,9 @@
1.219
1.220
1.221 # Test from where we are running configure, in or outside of src root.
1.222 -# To enable comparison of directories, CURDIR needs to be symlink free
1.223 -# just like SRC_ROOT already is
1.224 -NOSYM_CURDIR="$CURDIR"
1.225 -
1.226 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.227 - # Follow a chain of symbolic links. Use readlink
1.228 - # where it exists, else fall back to horribly
1.229 - # complicated shell code.
1.230 - if test "x$READLINK_TESTED" != yes; then
1.231 - # On MacOSX there is a readlink tool with a different
1.232 - # purpose than the GNU readlink tool. Check the found readlink.
1.233 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.234 - if test "x$ISGNU" = x; then
1.235 - # A readlink that we do not know how to use.
1.236 - # Are there other non-GNU readlinks out there?
1.237 - READLINK_TESTED=yes
1.238 - READLINK=
1.239 - fi
1.240 - fi
1.241 -
1.242 - if test "x$READLINK" != x; then
1.243 - NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
1.244 - else
1.245 - # Save the current directory for restoring afterwards
1.246 - STARTDIR=$PWD
1.247 - COUNTER=0
1.248 - sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
1.249 - sym_link_file=`$BASENAME $NOSYM_CURDIR`
1.250 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.251 - cd $sym_link_dir
1.252 - cd `$THEPWDCMD`
1.253 - sym_link_dir=`$THEPWDCMD`
1.254 - # Resolve file symlinks
1.255 - while test $COUNTER -lt 20; do
1.256 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.257 - if test "x$ISLINK" == x; then
1.258 - # This is not a symbolic link! We are done!
1.259 - break
1.260 - fi
1.261 - # Again resolve directory symlinks since the target of the just found
1.262 - # link could be in a different directory
1.263 - cd `$DIRNAME $ISLINK`
1.264 - sym_link_dir=`$THEPWDCMD`
1.265 - sym_link_file=`$BASENAME $ISLINK`
1.266 - let COUNTER=COUNTER+1
1.267 - done
1.268 - cd $STARTDIR
1.269 - NOSYM_CURDIR=$sym_link_dir/$sym_link_file
1.270 - fi
1.271 - fi
1.272 -
1.273 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
1.274 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.275 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.276 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
1.277 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.278 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.279 # We are running configure from the src root.
1.280 # Create a default ./build/target-variant-debuglevel output root.
1.281 if test "x${CONF_NAME}" = x; then
1.282 @@ -8128,7 +7976,7 @@
1.283 as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
1.284 fi
1.285
1.286 - OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`"
1.287 + OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
1.288 fi
1.289
1.290
1.291 @@ -10493,6 +10341,62 @@
1.292 fi
1.293
1.294
1.295 + # Extract the first word of "codesign", so it can be a program name with args.
1.296 +set dummy codesign; ac_word=$2
1.297 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.298 +$as_echo_n "checking for $ac_word... " >&6; }
1.299 +if test "${ac_cv_path_CODESIGN+set}" = set; then :
1.300 + $as_echo_n "(cached) " >&6
1.301 +else
1.302 + case $CODESIGN in
1.303 + [\\/]* | ?:[\\/]*)
1.304 + ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
1.305 + ;;
1.306 + *)
1.307 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.308 +for as_dir in $PATH
1.309 +do
1.310 + IFS=$as_save_IFS
1.311 + test -z "$as_dir" && as_dir=.
1.312 + for ac_exec_ext in '' $ac_executable_extensions; do
1.313 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.314 + ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
1.315 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.316 + break 2
1.317 + fi
1.318 +done
1.319 + done
1.320 +IFS=$as_save_IFS
1.321 +
1.322 + ;;
1.323 +esac
1.324 +fi
1.325 +CODESIGN=$ac_cv_path_CODESIGN
1.326 +if test -n "$CODESIGN"; then
1.327 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
1.328 +$as_echo "$CODESIGN" >&6; }
1.329 +else
1.330 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.331 +$as_echo "no" >&6; }
1.332 +fi
1.333 +
1.334 +
1.335 + if test "x$CODESIGN" != "x"; then
1.336 + # Verify that the openjdk_codesign certificate is present
1.337 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
1.338 +$as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
1.339 + rm -f codesign-testfile
1.340 + touch codesign-testfile
1.341 + codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
1.342 + rm -f codesign-testfile
1.343 + if test "x$CODESIGN" = x; then
1.344 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.345 +$as_echo "no" >&6; }
1.346 + else
1.347 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.348 +$as_echo "yes" >&6; }
1.349 + fi
1.350 + fi
1.351 fi
1.352
1.353
1.354 @@ -10939,6 +10843,18 @@
1.355 fi
1.356
1.357
1.358 +# Check whether --with-update-version was given.
1.359 +if test "${with_update_version+set}" = set; then :
1.360 + withval=$with_update_version;
1.361 +fi
1.362 +
1.363 +if test "x$with_update_version" = xyes; then
1.364 + as_fn_error $? "Update version must have a value" "$LINENO" 5
1.365 +elif test "x$with_update_version" != x; then
1.366 + JDK_UPDATE_VERSION="$with_update_version"
1.367 +fi
1.368 +
1.369 +
1.370 # Check whether --with-build-number was given.
1.371 if test "${with_build_number+set}" = set; then :
1.372 withval=$with_build_number;
1.373 @@ -11188,7 +11104,7 @@
1.374 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.375 fi
1.376
1.377 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.378 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.379 fi
1.380
1.381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.382 @@ -11520,7 +11436,7 @@
1.383 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.384 fi
1.385
1.386 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.387 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.388 fi
1.389
1.390 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.391 @@ -11666,7 +11582,7 @@
1.392 as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
1.393 fi
1.394
1.395 - JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`"
1.396 + JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
1.397 fi
1.398
1.399 if test ! -d "$JAVA_HOME_PROCESSED"; then
1.400 @@ -11838,7 +11754,7 @@
1.401 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.402 fi
1.403
1.404 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.405 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.406 fi
1.407
1.408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.409 @@ -12026,7 +11942,7 @@
1.410 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.411 fi
1.412
1.413 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.414 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.415 fi
1.416
1.417 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.418 @@ -12165,10 +12081,10 @@
1.419 COUNTER=0
1.420 sym_link_dir=`$DIRNAME $BINARY`
1.421 sym_link_file=`$BASENAME $BINARY`
1.422 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.423 cd $sym_link_dir
1.424 - cd `$THEPWDCMD`
1.425 - sym_link_dir=`$THEPWDCMD`
1.426 + # Use -P flag to resolve symlinks in directories.
1.427 + cd `$THEPWDCMD -P`
1.428 + sym_link_dir=`$THEPWDCMD -P`
1.429 # Resolve file symlinks
1.430 while test $COUNTER -lt 20; do
1.431 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.432 @@ -12179,7 +12095,7 @@
1.433 # Again resolve directory symlinks since the target of the just found
1.434 # link could be in a different directory
1.435 cd `$DIRNAME $ISLINK`
1.436 - sym_link_dir=`$THEPWDCMD`
1.437 + sym_link_dir=`$THEPWDCMD -P`
1.438 sym_link_file=`$BASENAME $ISLINK`
1.439 let COUNTER=COUNTER+1
1.440 done
1.441 @@ -12354,7 +12270,7 @@
1.442 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.443 fi
1.444
1.445 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.446 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.447 fi
1.448
1.449 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.450 @@ -12569,7 +12485,7 @@
1.451 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.452 fi
1.453
1.454 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.455 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.456 fi
1.457
1.458 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.459 @@ -12749,7 +12665,7 @@
1.460 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.461 fi
1.462
1.463 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.464 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.465 fi
1.466
1.467 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.468 @@ -12957,7 +12873,7 @@
1.469 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.470 fi
1.471
1.472 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.473 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.474 fi
1.475
1.476 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.477 @@ -13137,7 +13053,7 @@
1.478 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.479 fi
1.480
1.481 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.482 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.483 fi
1.484
1.485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.486 @@ -13345,7 +13261,7 @@
1.487 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.488 fi
1.489
1.490 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.491 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.492 fi
1.493
1.494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.495 @@ -13525,7 +13441,7 @@
1.496 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.497 fi
1.498
1.499 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.500 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.501 fi
1.502
1.503 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.504 @@ -13733,7 +13649,7 @@
1.505 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.506 fi
1.507
1.508 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.509 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.510 fi
1.511
1.512 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.513 @@ -13913,7 +13829,7 @@
1.514 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.515 fi
1.516
1.517 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.518 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.519 fi
1.520
1.521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.522 @@ -14108,7 +14024,7 @@
1.523 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.524 fi
1.525
1.526 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.527 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.528 fi
1.529
1.530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.531 @@ -14286,7 +14202,7 @@
1.532 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.533 fi
1.534
1.535 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.536 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.537 fi
1.538
1.539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.540 @@ -14482,7 +14398,7 @@
1.541 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.542 fi
1.543
1.544 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.545 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.546 fi
1.547
1.548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.549 @@ -14660,7 +14576,7 @@
1.550 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.551 fi
1.552
1.553 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.554 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.555 fi
1.556
1.557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.558 @@ -14855,7 +14771,7 @@
1.559 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.560 fi
1.561
1.562 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.563 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.564 fi
1.565
1.566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.567 @@ -15033,7 +14949,7 @@
1.568 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.569 fi
1.570
1.571 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.572 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.573 fi
1.574
1.575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.576 @@ -15229,7 +15145,7 @@
1.577 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.578 fi
1.579
1.580 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.581 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.582 fi
1.583
1.584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.585 @@ -15407,7 +15323,7 @@
1.586 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.587 fi
1.588
1.589 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.590 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.591 fi
1.592
1.593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.594 @@ -15584,7 +15500,7 @@
1.595 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.596 fi
1.597
1.598 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.599 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.600 fi
1.601
1.602 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.603 @@ -16261,14 +16177,28 @@
1.604 # Check whether --with-jtreg was given.
1.605 if test "${with_jtreg+set}" = set; then :
1.606 withval=$with_jtreg;
1.607 -fi
1.608 -
1.609 -
1.610 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTReg Regression Test Harness" >&5
1.611 -$as_echo_n "checking for JTReg Regression Test Harness... " >&6; }
1.612 -
1.613 - if test "x$with_jtreg" != x; then
1.614 - JT_HOME="$with_jtreg"
1.615 +else
1.616 + with_jtreg=no
1.617 +fi
1.618 +
1.619 +
1.620 + if test "x$with_jtreg" = xno; then
1.621 + # jtreg disabled
1.622 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.623 +$as_echo_n "checking for jtreg... " >&6; }
1.624 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.625 +$as_echo "no" >&6; }
1.626 + else
1.627 + if test "x$with_jtreg" != xyes; then
1.628 + # with path specified.
1.629 + JT_HOME="$with_jtreg"
1.630 + fi
1.631 +
1.632 + if test "x$JT_HOME" != x; then
1.633 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.634 +$as_echo_n "checking for jtreg... " >&6; }
1.635 +
1.636 + # use JT_HOME enviroment var.
1.637
1.638 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.639
1.640 @@ -16388,20 +16318,82 @@
1.641 as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
1.642 fi
1.643
1.644 - JT_HOME="`cd "$path"; $THEPWDCMD`"
1.645 - fi
1.646 -
1.647 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5
1.648 -$as_echo "$JT_HOME" >&6; }
1.649 -
1.650 - # jtreg win32 script works for everybody
1.651 - JTREGEXE="$JT_HOME/win32/bin/jtreg"
1.652 - if test ! -f "$JTREGEXE"; then
1.653 - as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
1.654 - fi
1.655 - else
1.656 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.657 -$as_echo "no" >&6; }
1.658 + JT_HOME="`cd "$path"; $THEPWDCMD -L`"
1.659 + fi
1.660 +
1.661 +
1.662 + # jtreg win32 script works for everybody
1.663 + JTREGEXE="$JT_HOME/win32/bin/jtreg"
1.664 +
1.665 + if test ! -f "$JTREGEXE"; then
1.666 + as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
1.667 + fi
1.668 +
1.669 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.670 +$as_echo "$JTREGEXE" >&6; }
1.671 + else
1.672 + # try to find jtreg on path
1.673 +
1.674 + for ac_prog in jtreg
1.675 +do
1.676 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.677 +set dummy $ac_prog; ac_word=$2
1.678 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.679 +$as_echo_n "checking for $ac_word... " >&6; }
1.680 +if test "${ac_cv_path_JTREGEXE+set}" = set; then :
1.681 + $as_echo_n "(cached) " >&6
1.682 +else
1.683 + case $JTREGEXE in
1.684 + [\\/]* | ?:[\\/]*)
1.685 + ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.686 + ;;
1.687 + *)
1.688 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.689 +for as_dir in $PATH
1.690 +do
1.691 + IFS=$as_save_IFS
1.692 + test -z "$as_dir" && as_dir=.
1.693 + for ac_exec_ext in '' $ac_executable_extensions; do
1.694 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.695 + ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.696 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.697 + break 2
1.698 + fi
1.699 +done
1.700 + done
1.701 +IFS=$as_save_IFS
1.702 +
1.703 + ;;
1.704 +esac
1.705 +fi
1.706 +JTREGEXE=$ac_cv_path_JTREGEXE
1.707 +if test -n "$JTREGEXE"; then
1.708 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.709 +$as_echo "$JTREGEXE" >&6; }
1.710 +else
1.711 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.712 +$as_echo "no" >&6; }
1.713 +fi
1.714 +
1.715 +
1.716 + test -n "$JTREGEXE" && break
1.717 +done
1.718 +
1.719 +
1.720 + if test "x$JTREGEXE" = x; then
1.721 + if test "xjtreg" = x; then
1.722 + PROG_NAME=jtregexe
1.723 + else
1.724 + PROG_NAME=jtreg
1.725 + fi
1.726 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.727 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.728 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.729 + fi
1.730 +
1.731 +
1.732 + JT_HOME="`$DIRNAME $JTREGEXE`"
1.733 + fi
1.734 fi
1.735
1.736
1.737 @@ -17377,7 +17369,7 @@
1.738 as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.739 fi
1.740
1.741 - MSVCR_DLL="`cd "$path"; $THEPWDCMD`"
1.742 + MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
1.743 fi
1.744
1.745
1.746 @@ -17534,7 +17526,7 @@
1.747 as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5
1.748 fi
1.749
1.750 - dxsdk_path="`cd "$path"; $THEPWDCMD`"
1.751 + dxsdk_path="`cd "$path"; $THEPWDCMD -L`"
1.752 fi
1.753
1.754
1.755 @@ -17672,7 +17664,7 @@
1.756 as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
1.757 fi
1.758
1.759 - DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`"
1.760 + DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
1.761 fi
1.762
1.763
1.764 @@ -17808,7 +17800,7 @@
1.765 as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
1.766 fi
1.767
1.768 - DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`"
1.769 + DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
1.770 fi
1.771
1.772
1.773 @@ -19395,10 +19387,10 @@
1.774 COUNTER=0
1.775 sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.776 sym_link_file=`$BASENAME $TEST_COMPILER`
1.777 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.778 cd $sym_link_dir
1.779 - cd `$THEPWDCMD`
1.780 - sym_link_dir=`$THEPWDCMD`
1.781 + # Use -P flag to resolve symlinks in directories.
1.782 + cd `$THEPWDCMD -P`
1.783 + sym_link_dir=`$THEPWDCMD -P`
1.784 # Resolve file symlinks
1.785 while test $COUNTER -lt 20; do
1.786 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.787 @@ -19409,7 +19401,7 @@
1.788 # Again resolve directory symlinks since the target of the just found
1.789 # link could be in a different directory
1.790 cd `$DIRNAME $ISLINK`
1.791 - sym_link_dir=`$THEPWDCMD`
1.792 + sym_link_dir=`$THEPWDCMD -P`
1.793 sym_link_file=`$BASENAME $ISLINK`
1.794 let COUNTER=COUNTER+1
1.795 done
1.796 @@ -19832,10 +19824,10 @@
1.797 COUNTER=0
1.798 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
1.799 sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
1.800 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.801 cd $sym_link_dir
1.802 - cd `$THEPWDCMD`
1.803 - sym_link_dir=`$THEPWDCMD`
1.804 + # Use -P flag to resolve symlinks in directories.
1.805 + cd `$THEPWDCMD -P`
1.806 + sym_link_dir=`$THEPWDCMD -P`
1.807 # Resolve file symlinks
1.808 while test $COUNTER -lt 20; do
1.809 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.810 @@ -19846,7 +19838,7 @@
1.811 # Again resolve directory symlinks since the target of the just found
1.812 # link could be in a different directory
1.813 cd `$DIRNAME $ISLINK`
1.814 - sym_link_dir=`$THEPWDCMD`
1.815 + sym_link_dir=`$THEPWDCMD -P`
1.816 sym_link_file=`$BASENAME $ISLINK`
1.817 let COUNTER=COUNTER+1
1.818 done
1.819 @@ -20968,10 +20960,10 @@
1.820 COUNTER=0
1.821 sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.822 sym_link_file=`$BASENAME $TEST_COMPILER`
1.823 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.824 cd $sym_link_dir
1.825 - cd `$THEPWDCMD`
1.826 - sym_link_dir=`$THEPWDCMD`
1.827 + # Use -P flag to resolve symlinks in directories.
1.828 + cd `$THEPWDCMD -P`
1.829 + sym_link_dir=`$THEPWDCMD -P`
1.830 # Resolve file symlinks
1.831 while test $COUNTER -lt 20; do
1.832 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.833 @@ -20982,7 +20974,7 @@
1.834 # Again resolve directory symlinks since the target of the just found
1.835 # link could be in a different directory
1.836 cd `$DIRNAME $ISLINK`
1.837 - sym_link_dir=`$THEPWDCMD`
1.838 + sym_link_dir=`$THEPWDCMD -P`
1.839 sym_link_file=`$BASENAME $ISLINK`
1.840 let COUNTER=COUNTER+1
1.841 done
1.842 @@ -21405,10 +21397,10 @@
1.843 COUNTER=0
1.844 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
1.845 sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
1.846 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.847 cd $sym_link_dir
1.848 - cd `$THEPWDCMD`
1.849 - sym_link_dir=`$THEPWDCMD`
1.850 + # Use -P flag to resolve symlinks in directories.
1.851 + cd `$THEPWDCMD -P`
1.852 + sym_link_dir=`$THEPWDCMD -P`
1.853 # Resolve file symlinks
1.854 while test $COUNTER -lt 20; do
1.855 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.856 @@ -21419,7 +21411,7 @@
1.857 # Again resolve directory symlinks since the target of the just found
1.858 # link could be in a different directory
1.859 cd `$DIRNAME $ISLINK`
1.860 - sym_link_dir=`$THEPWDCMD`
1.861 + sym_link_dir=`$THEPWDCMD -P`
1.862 sym_link_file=`$BASENAME $ISLINK`
1.863 let COUNTER=COUNTER+1
1.864 done
1.865 @@ -31131,7 +31123,7 @@
1.866 as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
1.867 fi
1.868
1.869 - with_freetype="`cd "$path"; $THEPWDCMD`"
1.870 + with_freetype="`cd "$path"; $THEPWDCMD -L`"
1.871 fi
1.872
1.873 FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
1.874 @@ -31433,7 +31425,7 @@
1.875 as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
1.876 fi
1.877
1.878 - FREETYPELOCATION="`cd "$path"; $THEPWDCMD`"
1.879 + FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
1.880 fi
1.881
1.882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
1.883 @@ -32933,6 +32925,9 @@
1.884 if test "$JOBS" -gt "16"; then
1.885 JOBS=16
1.886 fi
1.887 + if test "$JOBS" -eq "0"; then
1.888 + JOBS=1
1.889 + fi
1.890 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
1.891 $as_echo "$JOBS" >&6; }
1.892 else
