[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 1/5] meson: Fixes the ninjatool issue that E$$: are generated
From: |
luoyonggang |
Subject: |
[PATCH v4 1/5] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja |
Date: |
Wed, 26 Aug 2020 19:33:22 +0800 |
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
- [PATCH v4 1/5] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja,
luoyonggang <=