[PATCH 1/5] engine.pl: Fix i18n -o option in msvc buildsystem generator
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Dec 24, 2014, 10:47 UTC
- Message-ID
- <1419418034-6276-2-git-send-email-philipoakley@iee.org>
- 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