godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCons: Fix Python 3.12 SyntaxError with regex escape sequences 

(cherry picked from commit b362976504)
This commit is contained in:
Rémi Verschelde 2023-09-25 10:39:30 +02:00
parent 9308d20d1b
commit df0ebc6dfc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
methods.py
View File

@ -1016,13 +1016,13 @@ def get_compiler_version(env):
else: # TODO: Implement for MSVC else: # TODO: Implement for MSVC
return None return None
match = re.search( match = re.search(
"(?:(?<=version )|(?<=\) )|(?<=^))" r"(?:(?<=version )|(?<=\) )|(?<=^))"
"(?P<major>\d+)" r"(?P<major>\d+)"
"(?:\.(?P<minor>\d*))?" r"(?:\.(?P<minor>\d*))?"
"(?:\.(?P<patch>\d*))?" r"(?:\.(?P<patch>\d*))?"
"(?:-(?P<metadata1>[0-9a-zA-Z-]*))?" r"(?:-(?P<metadata1>[0-9a-zA-Z-]*))?"
"(?:\+(?P<metadata2>[0-9a-zA-Z-]*))?" r"(?:\+(?P<metadata2>[0-9a-zA-Z-]*))?"
"(?: (?P<date>[0-9]{8}|[0-9]{6})(?![0-9a-zA-Z]))?", r"(?: (?P<date>[0-9]{8}|[0-9]{6})(?![0-9a-zA-Z]))?",
version, version,
) )
if match is not None: if match is not None:

2
platform/linuxbsd/detect.py
View File

@ -455,7 +455,7 @@ def configure(env: "Environment"):
linker_version_str = subprocess.check_output( linker_version_str = subprocess.check_output(
[env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"]) [env.subst(env["LINK"]), "-Wl,--version"] + env.subst(env["LINKFLAGS"])
).decode("utf-8") ).decode("utf-8")
gnu_ld_version = re.search("^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE) gnu_ld_version = re.search(r"^GNU ld [^$]*(\d+\.\d+)$", linker_version_str, re.MULTILINE)
if not gnu_ld_version: if not gnu_ld_version:
print( print(
"Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold." "Warning: Creating export template binaries enabled for PCK embedding is currently only supported with GNU ld, not gold, LLD or mold."