From 0bdd2bb42180026fd86a06db169159f4b50080d5 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Mon, 19 Feb 2024 09:21:59 +0100
Subject: [PATCH] move cffi source into cffi backend

makes more sense to be there

and remove some unused compiler settings from build_cffi, since it only generates sources now
---
 buildutils/build_cffi.py                      | 84 +++++++------------
 .../_cffi.c => zmq/backend/cffi/_cffi_src.c   |  0
 2 files changed, 28 insertions(+), 56 deletions(-)
 rename buildutils/_cffi.c => zmq/backend/cffi/_cffi_src.c (100%)

diff --git a/buildutils/build_cffi.py b/buildutils/build_cffi.py
index 8c5d76481..067bea812 100644
--- a/buildutils/build_cffi.py
+++ b/buildutils/build_cffi.py
@@ -1,62 +1,34 @@
-import json
-import os
+"""Generate the CFFI backend C code"""
+
 import sys
+from pathlib import Path
 
 import cffi
 
-here = os.path.dirname(os.path.abspath(__file__))
-repo_root = os.path.dirname(here)
-zmq_dir = os.path.join(os.path.dirname(here), 'zmq')
-backend_dir = os.path.join(zmq_dir, 'backend', 'cffi')
-
-ffi = cffi.FFI()
-
-
-def load_compiler_config():
-    """load pyzmq compiler arguments"""
-    fname = os.path.join(zmq_dir, 'utils', 'compiler.json')
-    if os.path.exists(fname):
-        with open(fname) as f:
-            cfg = json.load(f)
-    else:
-        cfg = {}
-
-    cfg.setdefault("include_dirs", [os.path.join(zmq_dir, 'utils')])
-    cfg.setdefault("library_dirs", [])
-    cfg.setdefault("runtime_library_dirs", [])
-    cfg.setdefault("libraries", ["zmq"])
-
-    # cast to str, because cffi can't handle unicode paths (?!)
-    cfg['libraries'] = [str(lib) for lib in cfg['libraries']]
-    if 'zmq' not in cfg['libraries']:
-        cfg['libraries'].append('zmq')
-    for key in ("include_dirs", "library_dirs", "runtime_library_dirs"):
-        # interpret paths relative to parent of zmq (like source tree)
-        abs_paths = []
-        for p in cfg[key]:
-            if p.startswith('zmq'):
-                p = os.path.join(repo_root, p)
-            abs_paths.append(str(p))
-        cfg[key] = abs_paths
-    return cfg
-
-
-cfg = load_compiler_config()
-
-with open(os.path.join(backend_dir, '_cdefs.h')) as f:
-    ffi.cdef(f.read())
-
-with open(os.path.join(here, "_cffi.c")) as f:
-    _cffi_c = f.read()
-
-ffi.set_source(
-    'zmq.backend.cffi._cffi',
-    libraries=cfg['libraries'],
-    include_dirs=cfg['include_dirs'],
-    library_dirs=cfg['library_dirs'],
-    runtime_library_dirs=cfg['runtime_library_dirs'],
-    source=_cffi_c,
-)
+here = Path(__file__).parent.absolute()
+repo_root = here.parent
+zmq_dir = repo_root / 'zmq'
+backend_cffi = zmq_dir / 'backend' / 'cffi'
+
+
+def generate_cffi_c(dest_file: str):
+    """Generate CFFI backend extension C code
+
+    Called during build
+    """
+
+    ffi = cffi.FFI()
+
+    with (backend_cffi / '_cdefs.h').open() as f:
+        ffi.cdef(f.read())
+
+    with (backend_cffi / '_cffi_src.c').open() as f:
+        ffi.set_source(
+            'zmq.backend.cffi._cffi',
+            source=f.read(),
+        )
+    ffi.emit_c_code(dest_file)
+
 
 if __name__ == "__main__":
-    ffi.emit_c_code(sys.argv[1])
+    generate_cffi_c(sys.argv[1])
diff --git a/buildutils/_cffi.c b/zmq/backend/cffi/_cffi_src.c
similarity index 100%
rename from buildutils/_cffi.c
rename to zmq/backend/cffi/_cffi_src.c