updated

Author: GvozdevLeonid

setup.py

@@ -1,15 +1,14 @@
-from pathlib import Path
-from os import getenv, environ
+import subprocess
 import sys
+from os import environ, getenv
 
-from setuptools import setup, Extension, find_packages
-from setuptools.command.build_ext import build_ext
 import numpy
+from setuptools import Extension, find_packages, setup
+from setuptools.command.build_ext import build_ext
 
-libraries = ['usb-1.0', 'bladeRF']
+libraries = ['bladeRF']
 
-LIBBLADERF_FILES = list(Path('python_bladerf/pylibbladerf').rglob('*.pyx'))
-PYBLADERF_TOOLS_FILES = list(Path('python_bladerf/pybladerf_tools').rglob('*.pyx'))
+LIBBLADERF_FILES = ['python_bladerf/pylibbladerf/pybladerf.pyx', 'python_bladerf/pylibbladerf/cbladerf.pxd']
 
 INSTALL_REQUIRES = []
 SETUP_REQUIRES = []
@@ -19,30 +18,42 @@
 if getenv('LIBLINK'):
     PLATFORM = 'android'
 
-# detect cython
 if PLATFORM != 'android':
-    SETUP_REQUIRES.append('cython==0.29.36')
-    INSTALL_REQUIRES.append('cython==0.29.36')
-    INSTALL_REQUIRES.append('numpy>=1.26')
+    SETUP_REQUIRES.append('Cython==0.29.37')
+    INSTALL_REQUIRES.append('Cython==0.29.37')
+
+    SETUP_REQUIRES.append('numpy')
+    INSTALL_REQUIRES.append('numpy')
 
     cflags = environ.get('CFLAGS', '')
     ldflags = environ.get('LDFLAGS', '')
 
-    if PLATFORM == 'darwin':
-        new_cflags = '-I/opt/homebrew/include/libusb-1.0 -I/opt/homebrew/include'
-        new_ldflags = '-L/opt/homebrew/lib'
-    elif PLATFORM.startswith('linux'):
-        new_cflags = '-I/usr/include/libusb-1.0 -I/usr/include'
-        new_ldflags = '-L/usr/lib64 -L/usr/lib'
+    if PLATFORM in {'linux', 'darwin'}:
+        if environ.get('PYTHON_BLADERF_CFLAGS', None) is None:
+            try:
+                new_cflags = subprocess.check_output(['pkg-config', '--cflags', 'libbladerf']).decode('utf-8').strip()
+            except Exception:
+                raise RuntimeError('Unable to run pkg-config. Set cflags manually export PYTHON_BLADERF_CFLAGS=') from None
+        else:
+            new_cflags = environ.get('PYTHON_BLADERF_CFLAGS', '')
+
+        if environ.get('PYTHON_BLADERF_LDFLAGS', None) is None:
+            try:
+                new_ldflags = subprocess.check_output(['pkg-config', '--libs', 'libbladerf']).decode('utf-8').strip()
+            except Exception:
+                raise RuntimeError('Unable to run pkg-config. Set libs manually export PYTHON_BLADERF_LDFLAGS=') from None
+        else:
+            new_ldflags = environ.get('PYTHON_BLADERF_LDFLAGS', '')
+
     elif PLATFORM == 'win32':
         pass
 
     environ['CFLAGS'] = f'{cflags} {new_cflags}'.strip()
     environ['LDFLAGS'] = f'{ldflags} {new_ldflags}'.strip()
+
 else:
-    libraries = ['usb1.0', 'bladeRF']
+    LIBHACKRF_FILES = ['python_bladerf/pylibbladerf/pybladerf_android.pyx', 'python_bladerf/pylibbladerf/cbladerf_android.pxd']
 
-source_files = [str(fn) for fn in LIBBLADERF_FILES]
 
 setup(
     name='python_bladerf',
@@ -52,19 +63,26 @@
     ext_modules=[
         Extension(
             name='python_bladerf.pylibbladerf.pybladerf',
-            sources=source_files,
+            sources=LIBBLADERF_FILES,
             libraries=libraries,
             include_dirs=['python_bladerf/pylibbladerf', numpy.get_include()],
             extra_compile_args=['-w'],
         ),
         Extension(
             name='python_bladerf.pybladerf_tools.pybladerf_sweep',
-            sources=[str(fn) for fn in PYBLADERF_TOOLS_FILES],
+            sources=['python_bladerf/pybladerf_tools/pybladerf_sweep.pyx'],
+            include_dirs=['python_bladerf/pylibbladerf', 'python_bladerf/pybladerf_tools', numpy.get_include()],
+            extra_compile_args=['-w'],
+        ),
+        Extension(
+            name='python_bladerf.pybladerf_tools.pybladerf_transfer',
+            sources=['python_bladerf/pybladerf_tools/pybladerf_transfer.pyx'],
             include_dirs=['python_bladerf/pybladerf_tools', numpy.get_include()],
             extra_compile_args=['-w'],
-        )
+        ),
     ],
+    include_package_data=True,
     packages=find_packages(),
     package_dir={'': '.'},
-    include_package_data=True,
+    zip_safe=False,
 )