Move ffi and fix build path

lexiforest · Feb 2, 2024 · 5ca2939 · 5ca2939
1 parent 19e3030
commit 5ca2939
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
+include ffi/*
 include curl_cffi/_wrapper.*
-include curl_cffi/ffi/*
 include curl_cffi/include/curl/*
diff --git a/curl_cffi/ffi/cdef.c → ffi/cdef.c b/curl_cffi/ffi/cdef.c → ffi/cdef.c
diff --git a/curl_cffi/ffi/shim.c → ffi/shim.c b/curl_cffi/ffi/shim.c → ffi/shim.c
diff --git a/curl_cffi/ffi/shim.h → ffi/shim.h b/curl_cffi/ffi/shim.h → ffi/shim.h
diff --git a/scripts/build.py b/scripts/build.py
@@ -1,6 +1,7 @@
 import os
 import struct
 import platform
+from pathlib import Path
 
 from cffi import FFI
 
@@ -19,6 +20,7 @@
 else:
     libdir = os.path.expanduser("~/.local/lib")
 
+root_dir = Path(__file__).parent.parent
 
 ffibuilder.set_source(
     "curl_cffi._wrapper",
@@ -29,19 +31,19 @@
     library_dirs=[libdir],
     source_extension=".c",
     include_dirs=[
-        os.path.join(os.path.dirname(__file__), "include"),
-        os.path.join(os.path.dirname(__file__), "ffi"),
+        str(root_dir / "curl_cffi/include"),
+        str(root_dir / "ffi"),
     ],
     sources=[
-        os.path.join(os.path.dirname(__file__), "ffi/shim.c"),
+        str(root_dir / "ffi/shim.c"),
     ],
     extra_compile_args=(
         ["-Wno-implicit-function-declaration"] if uname.system == "Darwin" else []
     ),
     # extra_link_args=["-Wl,-rpath,$ORIGIN/../libcurl/" + arch],
 )
 
-with open(os.path.join(os.path.dirname(__file__), "ffi/cdef.c")) as f:
+with open(root_dir / "ffi/cdef.c") as f:
     cdef_content = f.read()
     ffibuilder.cdef(cdef_content)