git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Marius Storm-Olsen <mstormo@gmail.com>,
	Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Msysgit <msysgit@googlegroups.com>
Subject: [PATCH 1/5] engine.pl: Fix i18n -o option in msvc buildsystem generator
Date: Wed, 24 Dec 2014 10:47:10 +0000	[thread overview]
Message-ID: <1419418034-6276-2-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1419418034-6276-1-git-send-email-philipoakley@iee.org>

The i18n 5e9637c (i18n: add infrastructure for translating
Git with gettext, 2011-11-18) introduced an extra '-o' option
into the make file, which broke engine.pl code for extracting
the git.sln for msvc gui-IDE.

Add tests to remove these non linker options, in same vein as
74cf9bd (engine.pl: Fix a recent breakage of the buildsystem
generator, 2010-01-22).

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
 contrib/buildsystems/engine.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 23da787..f48c28a 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -140,6 +140,12 @@ sub parseMakeOutput
             next;
         }
 
+        if ($text =~ /^(mkdir|msgfmt) /) {
+            # options to the Portable Object translations
+            # the line "mkdir ... && msgfmt ..." contains no linker options
+            next;
+        }
+
         if($text =~ / -c /) {
             # compilation
             handleCompileLine($text, $line);
-- 
2.1.0

  reply	other threads:[~2014-12-24 10:47 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-24 10:47 [PATCH 0/5] Fix the Visual Studio 2008 .sln generator Philip Oakley
2014-12-24 10:47 ` Philip Oakley [this message]
2014-12-26 18:51   ` [PATCH 1/5] engine.pl: Fix i18n -o option in msvc buildsystem generator Philip Oakley
2014-12-24 10:47 ` [PATCH 2/5] engine.pl: Properly accept quoted spaces in filenames Philip Oakley
2014-12-24 10:47 ` [PATCH 3/5] engine.pl: ignore invalidcontinue.obj which is known to MSVC Philip Oakley
2014-12-24 10:47 ` [PATCH 4/5] vcbuild/readme: Improve layout and reference msvc-build script Philip Oakley
2014-12-24 10:47 ` [PATCH 5/5] engine.pl: provide more debug print statements Philip Oakley
2014-12-26 14:25 ` [PATCH 0/5] Fix the Visual Studio 2008 .sln generator Philip Oakley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419418034-6276-2-git-send-email-philipoakley@iee.org \
    --to=philipoakley@iee.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=mstormo@gmail.com \
    --cc=msysgit@googlegroups.com \
    --cc=ramsay@ramsay1.demon.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).