From 66eba20f794b05a55ab5c9a518d7edd9bfa609d8 Mon Sep 17 00:00:00 2001 From: erikj Date: Sat, 3 Nov 2012 16:28:14 -0700 Subject: [PATCH] 8002220: build-infra: update for mac, solaris 11 issues 8002184: Fixed exclude and includes for jarsigner in new build Reviewed-by: ohair --- common/autoconf/basics.m4 | 6 +- common/autoconf/basics_windows.m4 | 14 + common/autoconf/compare.sh.in | 1 + common/autoconf/generated-configure.sh | 449 ++++++++++++++++++++++++- common/autoconf/libraries.m4 | 4 +- common/bin/compare.sh | 37 +- common/bin/compare_exceptions.sh.incl | 22 ++ common/makefiles/JavaCompilation.gmk | 13 +- 8 files changed, 528 insertions(+), 18 deletions(-) diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 index cbfae39..bd058af 100644 --- a/common/autoconf/basics.m4 +++ b/common/autoconf/basics.m4 @@ -373,7 +373,11 @@ else # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for # other files files_present=`$LS $OUTPUT_ROOT` - if test "x$files_present" != x; then + # Configure has already touched config.log and confdefs.h in the current dir when this check + # is performed. + filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ + | $TR -d '\n'` + if test "x$filtered_files" != x; then AC_MSG_NOTICE([Current directory is $CURDIR.]) AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here]) AC_MSG_NOTICE([(as opposed to creating a configuration in /build/).]) diff --git a/common/autoconf/basics_windows.m4 b/common/autoconf/basics_windows.m4 index 548b3e4..c7f3d52 100644 --- a/common/autoconf/basics_windows.m4 +++ b/common/autoconf/basics_windows.m4 @@ -172,6 +172,13 @@ AC_DEFUN([BASIC_FIXUP_EXECUTABLE_CYGWIN], # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -181,6 +188,13 @@ AC_DEFUN([BASIC_FIXUP_EXECUTABLE_CYGWIN], arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in index 53d60b7..1a1b997 100644 --- a/common/autoconf/compare.sh.in +++ b/common/autoconf/compare.sh.in @@ -60,6 +60,7 @@ STAT="@STAT@" STRIP="@POST_STRIP_CMD@" TEE="@TEE@" UNIQ="@UNIQ@" +UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200" UNZIP="@UNZIP@" SRC_ROOT="@SRC_ROOT@" diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 9427b79..160265d 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3665,7 +3665,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1351539315 +DATE_WHEN_GENERATED=1351854415 ############################################################################### # @@ -7603,7 +7603,11 @@ else # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for # other files files_present=`$LS $OUTPUT_ROOT` - if test "x$files_present" != x; then + # Configure has already touched config.log and confdefs.h in the current dir when this check + # is performed. + filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \ + | $TR -d '\n'` + if test "x$filtered_files" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5 $as_echo "$as_me: Current directory is $CURDIR." >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: Since this is not the source root, configure will output the configuration here" >&5 @@ -7889,6 +7893,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -7898,6 +7909,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 @@ -8221,6 +8239,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -8230,6 +8255,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 @@ -8550,6 +8582,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -8559,6 +8598,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 @@ -8884,6 +8930,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -8893,6 +8946,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 @@ -9212,6 +9272,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -9221,6 +9288,13 @@ $as_echo "$as_me: Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 @@ -15963,6 +16037,13 @@ $as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -15972,6 +16053,13 @@ $as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5 @@ -16537,6 +16625,13 @@ done # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -16546,6 +16641,13 @@ done arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5 @@ -16823,6 +16925,13 @@ done # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -16832,6 +16941,13 @@ done arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5 @@ -17104,6 +17220,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -17113,6 +17236,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5 @@ -17621,6 +17751,13 @@ done # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -17630,6 +17767,13 @@ done arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5 @@ -18028,6 +18172,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -18037,6 +18188,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5 @@ -19076,6 +19234,13 @@ done # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -19085,6 +19250,13 @@ done arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5 @@ -19483,6 +19655,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -19492,6 +19671,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5 @@ -20355,6 +20541,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -20364,6 +20557,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5 @@ -20711,6 +20911,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -20720,6 +20927,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5 @@ -21033,6 +21247,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -21042,6 +21263,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5 @@ -21345,6 +21573,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -21354,6 +21589,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5 @@ -21641,6 +21883,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -21650,6 +21899,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5 @@ -21990,6 +22246,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -21999,6 +22262,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5 @@ -22271,6 +22541,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -22280,6 +22557,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5 @@ -22657,6 +22941,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -22666,6 +22957,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5 @@ -23032,6 +23330,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -23041,6 +23346,13 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5 @@ -23336,6 +23648,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -23345,6 +23664,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5 @@ -23628,6 +23954,13 @@ done # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -23637,6 +23970,13 @@ done arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 @@ -23909,6 +24249,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -23918,6 +24265,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 @@ -24190,6 +24544,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -24199,6 +24560,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 @@ -24524,6 +24892,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -24533,6 +24908,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 @@ -24857,6 +25239,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -24866,6 +25255,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 @@ -25203,6 +25599,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -25212,6 +25615,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5 @@ -25548,6 +25958,13 @@ if test "x$OBJDUMP" != x; then # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -25557,6 +25974,13 @@ if test "x$OBJDUMP" != x; then arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5 @@ -25832,6 +26256,13 @@ fi # Now try to locate executable using which new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # Oops. Which didn't find the executable. # The splitting of arguments from the executable at a space might have been incorrect, @@ -25841,6 +26272,13 @@ fi arguments="EOL" new_path=`$CYGPATH -u "$path"` new_path=`$WHICH "$new_path" 2> /dev/null` + # bat and cmd files are not always considered executable in cygwin causing which + # to not find them + if test "x$new_path" = x \ + && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ + && test "x`$LS \"$path\" 2>/dev/null`" != x; then + new_path=`$CYGPATH -u "$path"` + fi if test "x$new_path" = x; then # It's still not found. Now this is an unrecoverable error. { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5 @@ -29026,12 +29464,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBFREETYPE 1 -_ACEOF - - LIBS="-lfreetype $LIBS" - + FREETYPE2_FOUND=true else as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 fi diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index 32a62ba..aebdf8b 100644 --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 @@ -393,7 +393,9 @@ else # AC_CHECK_LIB does not support use of cl.exe PREV_LDFLAGS="$LDFLAGS" LDFLAGS="$FREETYPE2_LIBS" - AC_CHECK_LIB(freetype, FT_Init_FreeType, [], AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ])) + AC_CHECK_LIB(freetype, FT_Init_FreeType, + FREETYPE2_FOUND=true, + AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ])) LDFLAGS="$PREV_LDFLAGS" fi fi diff --git a/common/bin/compare.sh b/common/bin/compare.sh index ef3e80f..5816f83 100644 --- a/common/bin/compare.sh +++ b/common/bin/compare.sh @@ -352,6 +352,29 @@ compare_zip_file() { (cd $THIS_UNZIPDIR && $UNARCHIVE $THIS_ZIP) (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) + # Find all archives inside and unzip them as well to compare the contents rather than + # the archives. + EXCEPTIONS="" + for pack in $($FIND $THIS_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do + ($UNPACK200 $pack $pack.jar) + # Filter out the unzipped archives from the diff below. + EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" + done + for pack in $($FIND $OTHER_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do + ($UNPACK200 $pack $pack.jar) + EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" + done + for zip in $($FIND $THIS_UNZIPDIR -name "*.jar" -o -name "*.zip"); do + $MKDIR $zip.unzip + (cd $zip.unzip && $UNARCHIVE $zip) + EXCEPTIONS="$EXCEPTIONS $zip" + done + for zip in $($FIND $OTHER_UNZIPDIR -name "*.jar" -o -name "*.zip"); do + $MKDIR $zip.unzip + (cd $zip.unzip && $UNARCHIVE $zip) + EXCEPTIONS="$EXCEPTIONS $zip" + done + CONTENTS_DIFF_FILE=$WORK_DIR/$ZIP_FILE.diff # On solaris, there is no -q option. if [ "$OPENJDK_TARGET_OS" = "solaris" ]; then @@ -389,7 +412,7 @@ compare_zip_file() { $RM -f $WORK_DIR/$ZIP_FILE.diffs for file in $DIFFING_FILES; do - if [[ "$ACCEPTED_JARZIP_CONTENTS" != *"$file"* ]]; then + if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs fi done @@ -664,8 +687,8 @@ compare_bin_file() { # Check dependencies if [ -n "$LDD_CMD" ]; then - (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq) - (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.this | $UNIQ > $WORK_FILE_BASE.deps.this.uniq) + (cd $FILE_WORK_DIR && $CP $OTHER_FILE . && $LDD_CMD $NAME 2>/dev/null | $AWK '{ print $1;}' | $SORT | $TEE $WORK_FILE_BASE.deps.other | $UNIQ > $WORK_FILE_BASE.deps.other.uniq) + (cd $FILE_WORK_DIR && $CP $THIS_FILE . && $LDD_CMD $NAME 2 $WORK_FILE_BASE.deps.this.uniq) (cd $FILE_WORK_DIR && $RM -f $NAME) LANG=C $DIFF $WORK_FILE_BASE.deps.other $WORK_FILE_BASE.deps.this > $WORK_FILE_BASE.deps.diff @@ -846,7 +869,12 @@ compare_all_execs() { if [ "$OPENJDK_TARGET_OS" = "windows" ]; then EXECS=$(cd $THIS_DIR && $FIND . -type f -name '*.exe' | $SORT | $FILTER) else - EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' -o -name '*.jar' -o -name '*.diz' \) | $SORT | $FILTER) + EXECS=$(cd $THIS_DIR && $FIND . -name db -prune -o -type f -perm -100 \! \ + \( -name '*.so' -o -name '*.dylib' -o -name '*.dll' -o -name '*.cgi' \ + -o -name '*.jar' -o -name '*.diz' -o -name 'jcontrol' -o -name '*.properties' \ + -o -name '*.data' -o -name '*.bfc' -o -name '*.src' -o -name '*.txt' \ + -o -name '*.cfg' -o -name 'meta-index' -o -name '*.properties.ja' \ + -o -name 'classlist' \) | $SORT | $FILTER) fi if [ -n "$EXECS" ]; then @@ -1022,6 +1050,7 @@ fi if [ -d "$THIS/deploy/j2sdk-image" ]; then THIS_J2SDK="$THIS/deploy/j2sdk-image" THIS_J2RE="$THIS/deploy/j2re-image" + echo "Comparing deploy images" elif [ -d "$THIS/images/j2sdk-image" ]; then THIS_J2SDK="$THIS/images/j2sdk-image" THIS_J2RE="$THIS/images/j2re-image" diff --git a/common/bin/compare_exceptions.sh.incl b/common/bin/compare_exceptions.sh.incl index 3e2946d..c9fc3cc 100644 --- a/common/bin/compare_exceptions.sh.incl +++ b/common/bin/compare_exceptions.sh.incl @@ -282,6 +282,14 @@ ACCEPTED_SMALL_SIZE_DIFF=" ./jre/lib/i386/libunpack.so ./jre/lib/i386/libverify.so ./jre/lib/i386/libzip.so +./jre/lib/i386/libdeploy.so +./jre/lib/i386/libjavaplugin.so +./jre/lib/i386/libjavaplugin_jni.so +./jre/lib/i386/libjavaplugin_nscp.so +./jre/lib/i386/libjavaplugin_oji.so +./jre/lib/i386/libnpjp2.so +./jre/plugin/i386/ns4/libjavaplugin.so +./jre/plugin/i386/ns7/libjavaplugin_oji.so ./jre/lib/i386/server/libjvm.so ./bin/appletviewer ./bin/extcheck @@ -293,6 +301,7 @@ ACCEPTED_SMALL_SIZE_DIFF=" ./bin/javadoc ./bin/javah ./bin/javap +./bin/javaws ./bin/jcmd ./bin/jconsole ./bin/jdb @@ -322,6 +331,8 @@ ACCEPTED_SMALL_SIZE_DIFF=" ./bin/wsimport ./bin/xjc ./jre/bin/java +./jre/bin/java_vm +./jre/bin/javaws ./jre/bin/keytool ./jre/bin/orbd ./jre/bin/pack200 @@ -561,6 +572,14 @@ ACCEPTED_SMALL_SIZE_DIFF=" ./jre/lib/sparc/libunpack.so ./jre/lib/sparc/libverify.so ./jre/lib/sparc/libzip.so +./jre/lib/sparc/libdeploy.so +./jre/lib/sparc/libjavaplugin.so +./jre/lib/sparc/libjavaplugin_jni.so +./jre/lib/sparc/libjavaplugin_nscp.so +./jre/lib/sparc/libjavaplugin_oji.so +./jre/lib/sparc/libnpjp2.so +./jre/plugin/sparc/ns4/libjavaplugin.so +./jre/plugin/sparc/ns7/libjavaplugin_oji.so ./jre/lib/sparc/server/libjvm.so ./bin/appletviewer ./bin/extcheck @@ -572,6 +591,7 @@ ACCEPTED_SMALL_SIZE_DIFF=" ./bin/javadoc ./bin/javah ./bin/javap +./bin/javaws ./bin/jcmd ./bin/jconsole ./bin/jdb @@ -601,6 +621,8 @@ ACCEPTED_SMALL_SIZE_DIFF=" ./bin/wsimport ./bin/xjc ./jre/bin/java +./jre/bin/java_vm +./jre/bin/javaws ./jre/bin/keytool ./jre/bin/orbd ./jre/bin/pack200 diff --git a/common/makefiles/JavaCompilation.gmk b/common/makefiles/JavaCompilation.gmk index 8dd8899..0672662 100644 --- a/common/makefiles/JavaCompilation.gmk +++ b/common/makefiles/JavaCompilation.gmk @@ -480,19 +480,24 @@ define SetupJavaCompilation $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main # Set the $1_REMOTE to spawn a background javac server. - $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),poolsize=$(SJAVAC_SERVER_CORES),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC)))) + $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC)))) $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS) $(MKDIR) -p $$(@D) $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp) $(ECHO) Compiling $1 - $$($1_JVM) $$($1_SJAVAC) \ - $$($1_REMOTE) $$($1_SJAVAC_ARGS) \ + ($$($1_JVM) $$($1_SJAVAC) \ + $$($1_REMOTE) \ + -j $(NUM_CORES) \ --permit-unidentified-artifacts \ --permit-sources-without-package \ --compare-found-sources $$($1_BIN)/_the.batch.tmp \ + --log=$(LOG) \ + $$($1_SJAVAC_ARGS) \ $$($1_FLAGS) \ - -implicit:none -d $$($1_BIN) $$($1_HEADERS_ARG) + $$($1_HEADERS_ARG) \ + -d $$($1_BIN) && \ + $(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch) else # Using plain javac to batch compile everything. $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch -- GitLab