[8u-dev] Request for approval: 8176033: New cygwin grep does not match \r as newline

[David Buck]

Hi Kevin!

Here is the code review thread for the JDK 9 push:

http://mail.openjdk.java.net/pipermail/build-dev/2017-March/018751.html

Please be sure to always include a link to the code review thread(s) in 
future backport requests [0].

Also, please be sure to add an appropriate noreg label [1] to the bug 
report for any changeset that does not include a new regression test (or 
expand the scope of a preexisting test).

Please consider this request approved for push to 8u-dev once the noreg 
label has been added.

Cheers,
-Buck

[0] http://openjdk.java.net/projects/jdk8u/approval-template.html

[1] http://openjdk.java.net/guide/changePlanning.html#noreg

On 2018/04/07 6:30, Kevin Walls wrote:
> Hi,
> 
> I'd like to request approval to backport to 8u:
> 
> 8176033: New cygwin grep does not match \r as newline
> 
> JBS: https://bugs.openjdk.java.net/browse/JDK-8176033
> 9 changeset: http://hg.openjdk.java.net/jdk9/jdk9/raw-rev/01d26dcf5eac
> 
> This very small change was pointed out to me as worth doing, it's 
> another trap waiting for people who vary the cygwin version in their 
> Windows build environment.
> 
> The 8u diff is pasted below.  The 9 changeset didn't "hg import" from, 
> but the affected lines are the same, using TR to delete characters 
> rather than relying on grep.  Plus rebuilding generated-configure.sh 
> with the autogen script.
> 
> Thanks
> Kevin
> 
> 
> bash-4.2$ hg diff common/autoconf/basics_windows.m4
> diff -r cddffb220808 common/autoconf/basics_windows.m4
> --- a/common/autoconf/basics_windows.m4 Fri Apr 06 04:20:26 2018 -0700
> +++ b/common/autoconf/basics_windows.m4 Fri Apr 06 14:20:35 2018 -0700
> @@ -321,8 +321,8 @@
>         AC_MSG_ERROR([Something is wrong with your cygwin installation 
> since I cannot find cygpath.exe in your path])
>       fi
>       AC_MSG_CHECKING([cygwin root directory as unix-style path])
> -    # The cmd output ends with Windows line endings (CR/LF), the grep 
> command will strip that away
> -    cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
> +    # The cmd output ends with Windows line endings (CR/LF)
> +    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
>       # Force cygpath to report the proper root by including a trailing 
> space, and then stripping it off again.
>       CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 
> -d " "`
>       AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
> 
> 
>