qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: luoyonggang@gmail.com
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Yonggang Luo" <luoyonggang@gmail.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PATCH v5 1/6] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja
Date: Wed, 26 Aug 2020 23:10:01 +0800	[thread overview]
Message-ID: <20200826151006.80-1-luoyonggang@gmail.com> (raw)

From: Yonggang Luo <luoyonggang@gmail.com>

SIMPLE_PATH_RE should match the full path token.
Or the $ and : contained in path would not matched if the path are start with C:/ and E:/

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 scripts/ninjatool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py
index cc77d51aa8..6ca8be6f10 100755
--- a/scripts/ninjatool.py
+++ b/scripts/ninjatool.py
@@ -55,7 +55,7 @@ else:
 
 PATH_RE = r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}"
 
-SIMPLE_PATH_RE = re.compile(r"[^$\s:|]+")
+SIMPLE_PATH_RE = re.compile(r"^[^$\s:|]+$")
 IDENT_RE = re.compile(r"[a-zA-Z0-9_.-]+$")
 STRING_RE = re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.")
 TOPLEVEL_RE = re.compile(r"([=:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|.")
-- 
2.27.0.windows.1



             reply	other threads:[~2020-08-26 15:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-26 15:10 luoyonggang [this message]
2020-08-26 15:10 ` [PATCH v5 2/6] meson: fixes relpath may fail on win32 luoyonggang
2020-08-26 15:10 ` [PATCH v5 3/6] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 luoyonggang
2020-08-26 15:10 ` [PATCH v5 4/6] configure: Fix include and linkage issue on msys2 luoyonggang
2020-08-26 15:24   ` Paolo Bonzini
2020-08-26 15:33     ` 罗勇刚(Yonggang Luo)
2020-08-26 15:36       ` Paolo Bonzini
2020-08-26 15:38         ` 罗勇刚(Yonggang Luo)
2020-08-27 16:14   ` Mark Cave-Ayland
2020-08-26 15:10 ` [PATCH v5 5/6] meson: Fixes ninjatool can not be recognized as script under Window/MSYS2 luoyonggang
2020-08-26 15:10 ` [PATCH v5 6/6] meson: Convert undefsym.sh to undefsym.py luoyonggang
2020-08-26 15:22   ` Paolo Bonzini
2020-08-26 15:27     ` 罗勇刚(Yonggang Luo)
2020-08-26 15:28 ` [PATCH v5 1/6] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja Paolo Bonzini
2020-08-26 15:31   ` 罗勇刚(Yonggang Luo)
2020-08-26 15:36     ` Paolo Bonzini
2020-08-26 15:39       ` 罗勇刚(Yonggang Luo)
2020-08-26 15:41         ` Paolo Bonzini
2020-08-26 15:45           ` 罗勇刚(Yonggang Luo)
2020-08-26 15:47           ` 罗勇刚(Yonggang Luo)
2020-08-26 15:56             ` Paolo Bonzini
2020-08-26 16:09               ` 罗勇刚(Yonggang Luo)
2020-08-26 16:17                 ` 罗勇刚(Yonggang Luo)

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=20200826151006.80-1-luoyonggang@gmail.com \
    --to=luoyonggang@gmail.com \
    --cc=berrange@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).