From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
sschuberth@gmail.com, GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH 1/4] engine.pl: Fix a recent breakage of the buildsystem generator
Date: Wed, 20 Jan 2010 19:23:36 +0000 [thread overview]
Message-ID: <4B575838.2010504@ramsay1.demon.co.uk> (raw)
Commit ade2ca0c (Do not try to remove directories when removing
old links, 27-10-2009) added an expression to a 'test' using an
'-o' or connective. This resulted in the buildsystem generator
mistaking the conditional 'rm' for a linker command. In order
to fix the breakage, we filter the out the conditional 'rm'
commands before attempting to identify other commands.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
contrib/buildsystems/engine.pl | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index d506717..245af73 100644
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -135,6 +135,11 @@ sub parseMakeOutput
}
} while($ate_next);
+ if ($text =~ /^test / && $text =~ /|| rm -f /) {
+ # commands removing executables, if they exist
+ next;
+ }
+
if($text =~ / -c /) {
# compilation
handleCompileLine($text, $line);
--
1.6.6
next reply other threads:[~2010-01-20 20:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-20 19:23 Ramsay Jones [this message]
2010-01-20 20:57 ` [PATCH 1/4] engine.pl: Fix a recent breakage of the buildsystem generator Pete Harlan
2010-01-22 18:58 ` Ramsay Jones
2010-01-20 22:54 ` Sebastian Schuberth
2010-01-22 19:40 ` Ramsay Jones
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=4B575838.2010504@ramsay1.demon.co.uk \
--to=ramsay@ramsay1.demon.co.uk \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=sschuberth@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.