This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: GCC's classpath/scripts/check_jni_methods.sh vs diff -b
- From: Andrew Haley <aph-gcc at littlepinkcloud dot COM>
- To: Alexandre Oliva <aoliva at redhat dot com>
- Cc: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org, classpath at developer dot classpath dot berkeleysignal dot com
- Date: Mon, 1 Oct 2007 19:47:38 +0100
- Subject: Re: GCC's classpath/scripts/check_jni_methods.sh vs diff -b
- References: <orir5qbs0a.fsf@free.oliva.athome.lsd.ic.unicamp.br>
Alexandre Oliva writes:
> diff -b doesn't completely ignore all whitespace, but rather only
> differences as to the amount of whitespace; so whether whitespace is
> present or not is regarded as a difference.
>
> However, check_jni_methods.sh expects it to ignore a single trailing
> blank vs no trailing whitespace whatsoever. diff -B does, but I don't
> think that's portable enough for us to use it.
>
> So I've changed the regular expressions such that they'd be more
> inclusive, instead of demanding and discarding whitespace before open
> parentheses, and removed the -b then rendered unnecessary.
>
> Without this patch, I couldn't build libjava on the development tree
> that will eventually turn into Fedora 8, but it built on Fedora 7 just
> fine.
>
> Unless someone tells me not to, I'm going to check this into GCC trunk
> tomorrow or so. Bootstrapped on x86_64-linux-gnu.
>
> Index: libjava/classpath/ChangeLog
> from Alexandre Oliva <aoliva@redhat.com>
>
> * scripts/check_jni_methods.sh: Don't depend on diff -b ignoring
> a single trailing whitespace.
>
OK, thanks.
Andrew.