Feat: fix windows build script

This commit is contained in:
2026-03-18 13:39:45 +01:00
parent 712bd4e74e
commit 005155e486
2 changed files with 32 additions and 13 deletions

View File

@@ -442,22 +442,25 @@ def make_appimage(root: Path, binary: Path, arch: str, output_dir: Path, log: li
# ---------------------------------------------------------------------------
def make_nsis(root: Path, rd: Path, version: str, output_dir: Path, log: list[str]) -> str | None:
def make_nsis(root: Path, rd: Path, version: str, output_dir: Path, config: BuildConfig, log: list[str]) -> str | None:
if not shutil.which("makensis"):
log.append(" makensis not found, skipping NSIS installer")
return None
log.append(" Building NSIS installer")
abs_root = str(root.resolve())
run_cmd([
cmd = [
"makensis",
f"-DVERSION={version}",
f"-DCLI_EXE={abs_root}/{rd.relative_to(root)}/cagire.exe",
f"-DDESKTOP_EXE={abs_root}/{rd.relative_to(root)}/cagire-desktop.exe",
f"-DICON={abs_root}/assets/Cagire.ico",
f"-DOUTDIR={abs_root}/{OUT}",
str(root / "nsis" / "cagire.nsi"),
], log)
]
if config.cli:
cmd.append(f"-DCLI_EXE={abs_root}/{rd.relative_to(root)}/cagire.exe")
if config.desktop:
cmd.append(f"-DDESKTOP_EXE={abs_root}/{rd.relative_to(root)}/cagire-desktop.exe")
cmd.append(str(root / "nsis" / "cagire.nsi"))
run_cmd(cmd, log)
installer = f"cagire-{version}-windows-x86_64-setup.exe"
log.append(f" Installer -> {output_dir / installer}")
@@ -506,7 +509,7 @@ def copy_artifacts(root: Path, p: Platform, config: BuildConfig, log: list[str])
artifacts.append(dmg)
if p.os == "windows":
nsis = make_nsis(root, rd, version, out, log)
nsis = make_nsis(root, rd, version, out, config, log)
if nsis:
artifacts.append(nsis)