From e01993e5bcab97b874354e1a4995ca05a5a31e84 Mon Sep 17 00:00:00 2001 From: nulano Date: Wed, 12 Aug 2020 22:44:43 +0200 Subject: [PATCH 1/2] update LCMS2 target version --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 41da45e4520..6a96e9649a5 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -205,7 +205,7 @@ def cmd_msbuild( # retarget to default toolset (selected by vcvarsall.bat) "v141": "$(DefaultPlatformToolset)", # noqa: E501 # retarget to latest (selected by vcvarsall.bat) - "8.1": "$(WindowsSDKVersion)", # noqa: E501 + "10.0.17134.0": "$(WindowsSDKVersion)", # noqa: E501 } }, "build": [ From a1c8cad206ff53d5eebf7200f26b34ede1cbbb96 Mon Sep 17 00:00:00 2001 From: nulano Date: Wed, 12 Aug 2020 22:45:29 +0200 Subject: [PATCH 2/2] always check patch is actually applied --- winbuild/build_prepare.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 6a96e9649a5..abd56be0c29 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -420,7 +420,10 @@ def build_dep(name): with open(patch_file, "r") as f: text = f.read() for patch_from, patch_to in patch_list.items(): - text = text.replace(patch_from.format(**prefs), patch_to.format(**prefs)) + patch_from = patch_from.format(**prefs) + patch_to = patch_to.format(**prefs) + assert patch_from in text + text = text.replace(patch_from, patch_to) with open(patch_file, "w") as f: f.write(text)