From 0251d838c9f2a7f94ca070e595b83d3bcd1f1aa2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 29 Nov 2024 12:33:44 +1100 Subject: [PATCH] Do not install meson if libavif is disabled --- winbuild/build_prepare.py | 44 +++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 3137837754a..4ebf1f04226 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -673,21 +673,24 @@ def build_dep(name: str, prefs: dict[str, str], verbose: bool) -> str: def build_dep_all(disabled: list[str], prefs: dict[str, str], verbose: bool) -> None: lines = [r'call "{build_dir}\build_env.cmd"'] gha_groups = "GITHUB_ACTIONS" in os.environ - scripts = ["install_meson.cmd"] for dep_name in DEPS: print() if dep_name in disabled: print(f"Skipping disabled dependency {dep_name}") continue + + scripts = [] + if dep_name == "libavif": + scripts.append("install_meson.cmd") scripts.append(build_dep(dep_name, prefs, verbose)) - for script in scripts: - if gha_groups: - lines.append(f"@echo ::group::Running {script}") - lines.append(rf'cmd.exe /c "{{build_dir}}\{script}"') - lines.append("if errorlevel 1 echo Build failed! && exit /B 1") - if gha_groups: - lines.append("@echo ::endgroup::") + for script in scripts: + if gha_groups: + lines.append(f"@echo ::group::Running {script}") + lines.append(rf'cmd.exe /c "{{build_dir}}\{script}"') + lines.append("if errorlevel 1 echo Build failed! && exit /B 1") + if gha_groups: + lines.append("@echo ::endgroup::") print() lines.append("@echo All Pillow dependencies built successfully!") write_script("build_dep_all.cmd", lines, prefs, verbose) @@ -830,18 +833,19 @@ def main() -> None: print() write_script(".gitignore", ["*"], prefs, args.verbose) - write_script( - "install_meson.cmd", - [ - r'call "{build_dir}\build_env.cmd"', - "@echo " + ("=" * 70), - f"@echo ==== {'Building meson':<60} ====", - "@echo " + ("=" * 70), - f"{sys.executable} -m pip install meson=={V['MESON']}", - ], - prefs, - args.verbose, - ) + if "libavif" not in disabled: + write_script( + "install_meson.cmd", + [ + r'call "{build_dir}\build_env.cmd"', + "@echo " + ("=" * 70), + f"@echo ==== {'Building meson':<60} ====", + "@echo " + ("=" * 70), + f"{sys.executable} -m pip install meson=={V['MESON']}", + ], + prefs, + args.verbose, + ) build_env(prefs, args.verbose) build_dep_all(disabled, prefs, args.verbose)