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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Johannes Schindelin" <Johannes.Schindelin@xxxxxx>
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

Yes, Makefile#L2195 (of the new version)

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

OK will use.

+            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) /)

That's good, will use.


Ciao,
Johannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]