Re: [RFC 1/4] Fix i18n -o option in msvc engine.pl

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 21, 2014, 09:41 UTC
Message-ID: <alpine.DEB.1.00.1411211038570.13845@s15462909.onlinehome-server.info>
In-Reply-To: <1416526682-6024-2-git-send-email-philipoakley@iee.org>

Hi Philip,

On Thu, 20 Nov 2014, Philip Oakley wrote:

>     The i18n 5e9637c6 introduced an extra '-o' option
>     into the make file,

I take it you are referring to

	https://github.com/git/git/commit/5e9637c6#diff-b67911656ef5d18c4ae36cb6741b7965R2195

Show 11 quoted lines

> diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
> index 23da787..9144ea7 100755
> --- a/contrib/buildsystems/engine.pl
> +++ b/contrib/buildsystems/engine.pl
> @@ -140,6 +140,18 @@ sub parseMakeOutput
>              next;
>          }
>  
> +        if ($text =~ /^mkdir /) {
> +            # options to the Portable Object translations in the line
> +            # mkdir -p po/... && msgfmt ... (eg -o) may be mistaken for linker options

Maybe better

		# the line "mkdir ... && msgfmt ..." contains no linker options

Show 8 quoted lines

> +            next;
> +        }
> +
> +        if ($text =~ /^msgfmt /) {
> +            # options to the Portable Object translations in the line
> +            # mkdir -p po/... && msgfmt ... (eg -o) may be mistaken for linker options
> +            next;
> +        }

These two if clauses do the same, maybe call it

	if ($test =~ /^(mkdir|msgfmt) /)

Ciao, Johannes