[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in
From: |
luoyonggang |
Subject: |
[PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja 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:/ |
Date: |
Tue, 25 Aug 2020 22:49:16 +0800 |
From: 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 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja 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:/,
luoyonggang <=
- [PATCH 2/4] meson: fixes relpath may fail on win32. On win32, os.path.relpath would raise exception when do the following relpath: C:/msys64/mingw64/x.exe relative to E:/path/qemu-build would fail. So we try catch it for stopping it from raise exception on msys2, luoyonggang, 2020/08/25
- [PATCH 3/4] meson: Mingw64 gcc doesn't recognize system include_type for sdl2, luoyonggang, 2020/08/25
- [PATCH 4/4] configure: Fix include and linkage issue on msys2 On msys2, the -I/e/path/to/qemu -L/e/path/to/qemu are not recognized by the compiler Case $PWD are result msys type path such as /e/path/to/qemu but `pwd -W` are result E:/path/to/qemu that can be recognized by the compiler So we replace all $PWD with $build_path that can handling msys2/mingw properly, luoyonggang, 2020/08/25
- Re: [PATCH 1/4] meson: Fixes the ninjatool issue that E$$: are generated in Makefile.ninja 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:/, Markus Armbruster, 2020/08/26