Pass through ctypesgen executable as well

setupsrc/pl_setup/build_pdfium.py

@@ -173,7 +173,7 @@ def find_lib(srcname=None, directory=PDFiumBuildDir):
     return libpath
 
 
-def pack(src_libpath, destname=None):
+def pack(Ctypesgen, src_libpath, destname=None):
 
     if os.path.isdir(OutputDir):
         shutil.rmtree(OutputDir)
@@ -188,7 +188,7 @@ def pack(src_libpath, destname=None):
     include_dir = join(OutputDir, "include")
     shutil.copytree(join(PDFiumDir, "public"), include_dir)
 
-    call_ctypesgen(OutputDir, include_dir)
+    call_ctypesgen(Ctypesgen, OutputDir, include_dir)
     shutil.rmtree(include_dir)
 
 
@@ -226,6 +226,7 @@ def main(
     ):
 
     Git = shutil.which("git")
+    Ctypesgen = shutil.which("ctypesgen")
 
     if b_revision is None:
         b_revision = "main"
@@ -258,7 +259,7 @@ def main(
     configure(GN, config_str)
     build(Ninja, b_target)
     libpath = find_lib(b_srcname)
-    pack(libpath, b_destname)
+    pack(Ctypesgen, libpath, b_destname)
 
 
 def parse_args(argv):

setupsrc/pl_setup/packaging_base.py

@@ -92,11 +92,11 @@ def get_latest_version(Git):
     return int( tag.split("/")[-1] )
 
 
-def call_ctypesgen(platform_dir, include_dir):
+def call_ctypesgen(Ctypesgen, platform_dir, include_dir):
 
     bindings_file = join(platform_dir, "_pypdfium.py")
 
-    ctypesgen_cmd = [shutil.which("ctypesgen"), "--library", "pdfium", "--strip-build-path", platform_dir, "-L", "."] + sorted(glob( join(include_dir, "*.h") )) + ["-o", bindings_file]
+    ctypesgen_cmd = [Ctypesgen, "--library", "pdfium", "--strip-build-path", platform_dir, "-L", "."] + sorted(glob( join(include_dir, "*.h") )) + ["-o", bindings_file]
     run_cmd(ctypesgen_cmd, cwd=platform_dir)
 
     with open(bindings_file, "r") as file_reader:

setupsrc/pl_setup/update_pdfium.py

@@ -89,7 +89,7 @@ def unpack_archives(archives):
         os.remove(file)
 
 
-def generate_bindings(archives): 
+def generate_bindings(Ctypesgen, archives):
 
     for platform_dir in archives.keys():
 
@@ -112,7 +112,7 @@ def generate_bindings(archives):
 
         shutil.move(join(bin_dir, items[0]), join(platform_dir, target_name))
 
-        call_ctypesgen(platform_dir, join(build_dir, "include"))
+        call_ctypesgen(Ctypesgen, platform_dir, join(build_dir, "include"))
         shutil.rmtree(build_dir)
 
 
@@ -135,6 +135,7 @@ def get_download_files(platforms):
 def main(platforms):
 
     Git = shutil.which("git")
+    Ctypesgen = shutil.which("ctypesgen")
 
     download_files = get_download_files(platforms)
 
@@ -144,7 +145,7 @@ def main(platforms):
 
     archives = download_releases(latest, download_files)
     unpack_archives(archives)
-    generate_bindings(archives)
+    generate_bindings(Ctypesgen, archives)
 
 
 def parse_args(argv):