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

Merge pull request #88134 from akien-mga/scons-wayland-py3.12-escape 

SCons: Use r-strings for wayland-scanner builder command
This commit is contained in:
Rémi Verschelde 2024-02-09 18:10:19 +01:00
parent 27e575a4dd 03c8a0d089
commit 4e990cd7e5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/linuxbsd/wayland/SCsub
View File

@ -11,14 +11,14 @@ if env["use_sowrap"]:
WAYLAND_BUILDERS_SOWRAP = { WAYLAND_BUILDERS_SOWRAP = {
"WAYLAND_API_HEADER": Builder( "WAYLAND_API_HEADER": Builder(
action=Action( action=Action(
"wayland-scanner -c client-header < ${SOURCE} | sed 's:wayland-client-core\.h:../dynwrappers/wayland-client-core-so_wrap\.h:' > ${TARGET}", r"wayland-scanner -c client-header < ${SOURCE} | sed 's:wayland-client-core\.h:../dynwrappers/wayland-client-core-so_wrap\.h:' > ${TARGET}",
'Generating Wayland client header: "${TARGET}"', 'Generating Wayland client header: "${TARGET}"',
), ),
single_source=True, single_source=True,
), ),
"WAYLAND_API_CODE": Builder( "WAYLAND_API_CODE": Builder(
action=Action( action=Action(
"wayland-scanner -c private-code < ${SOURCE} | sed 's:wayland-util\.h:../dynwrappers/wayland-client-core-so_wrap\.h:' > ${TARGET}", r"wayland-scanner -c private-code < ${SOURCE} | sed 's:wayland-util\.h:../dynwrappers/wayland-client-core-so_wrap\.h:' > ${TARGET}",
'Generating Wayland protocol marshaling code: "${TARGET}"', 'Generating Wayland protocol marshaling code: "${TARGET}"',
), ),
single_source=True, single_source=True,
@ -29,14 +29,14 @@ else:
WAYLAND_BUILDERS = { WAYLAND_BUILDERS = {
"WAYLAND_API_HEADER": Builder( "WAYLAND_API_HEADER": Builder(
action=Action( action=Action(
"wayland-scanner -c client-header < ${SOURCE} > ${TARGET}", r"wayland-scanner -c client-header < ${SOURCE} > ${TARGET}",
'Generating Wayland client header: "${TARGET}"', 'Generating Wayland client header: "${TARGET}"',
), ),
single_source=True, single_source=True,
), ),
"WAYLAND_API_CODE": Builder( "WAYLAND_API_CODE": Builder(
action=Action( action=Action(
"wayland-scanner -c private-code < ${SOURCE} > ${TARGET}", r"wayland-scanner -c private-code < ${SOURCE} > ${TARGET}",
'Generating Wayland protocol marshaling code: "${TARGET}"', 'Generating Wayland protocol marshaling code: "${TARGET}"',
), ),
single_source=True, single_source=True,