From 23f0af168cf80878f201924f9988fbd9e5aea5ef Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Sep 2025 00:44:01 +0530
Subject: [PATCH] DRYer

---
 bypy/windows/__main__.py | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/bypy/windows/__main__.py b/bypy/windows/__main__.py
index cfaf618e4a..5ee692b0a8 100644
--- a/bypy/windows/__main__.py
+++ b/bypy/windows/__main__.py
@@ -86,7 +86,6 @@ def run_compiler(env, *cmd):
 
 
 def sign_file(path: str) -> None:
-    global num_signatures
     sign_file_in_client(path)
     signatures.add(path)
 
@@ -408,7 +407,7 @@ def add_dir_to_zip(zf, path, prefix=''):
         os.chdir(cwd)
 
 
-def build_utils(env, sign):
+def build_utils(env):
 
     def build(src, name, subsys='CONSOLE', libs='setupapi.lib'.split()):
         printf('Building ' + name)
@@ -426,14 +425,12 @@ def build_utils(env, sign):
             '/SUBSYSTEM:' + subsys, '/RELEASE', '/MANIFEST:EMBED', '/MANIFESTINPUT:' + mf,
             '/OUT:' + exe] + [embed_resources(env, exe), obj] + libs
         run(*cmd)
-        if sign:
-            sign_file(exe)
     base = d(a(__file__))
     build(j(base, 'file_dialogs.cpp'), 'calibre-file-dialog.exe', 'WINDOWS', 'Ole32.lib Shell32.lib'.split())
     build(j(base, 'eject.c'), 'calibre-eject.exe')
 
 
-def build_launchers(env, incdir, sign, debug=False):
+def build_launchers(env, incdir, debug=False):
     if not os.path.exists(env.obj_dir):
         os.makedirs(env.obj_dir)
     dflags = (['/Zi'] if debug else [])
@@ -459,8 +456,6 @@ def build_launchers(env, incdir, sign, debug=False):
             '/delayload:python%s.dll' % env.py_ver.replace('.', '')]
     printf('Linking calibre-launcher.dll')
     run(*cmd)
-    if sign:
-        sign_file(dll)
 
     src = j(base, 'main.c')
     shutil.copy2(dll, env.dll_dir)
@@ -495,8 +490,6 @@ def build_launchers(env, incdir, sign, debug=False):
                 'user32.lib', 'kernel32.lib',
                 '/OUT:' + exe] + u32 + dlflags + [embed_resources(env, exe), dest, lib]
             run(*cmd)
-            if sign:
-                sign_file(exe)
 
 
 def copy_crt_and_d3d(env):
@@ -558,8 +551,8 @@ def main():
     incdir = mkdtemp('include')
     initbase(env)
     freeze(env, ext_dir, incdir)
-    build_launchers(env, incdir, args.sign_installers)
-    build_utils(env, args.sign_installers)
+    build_launchers(env, incdir)
+    build_utils(env)
     embed_manifests(env)
     copy_crt_and_d3d(env)
     if args.sign_installers: