X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fpython%2Fsetup.py;h=50c938561a829d535001e732df2f7a66bae4034c;hb=0e1a7fe91a9132ad586337bdd29d93eff4344edd;hp=a4426032074d84e5305271e2da6865a699829d76;hpb=f774095496a5ab9b68ce79503ae7d45f717c0006;p=libsigrok.git

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
index a4426032..50c93856 100644
--- a/bindings/python/setup.py
+++ b/bindings/python/setup.py
@@ -18,10 +18,12 @@
 ##
 
 from setuptools import setup, find_packages, Extension
+from distutils.command.build_py import build_py as _build_py
+from distutils.command.build_ext import build_ext as _build_ext
 import subprocess
 import os
 
-env = os.environ.copy()
+srcdir = os.path.split(__file__)[0]
 
 sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
     subprocess.check_output(
@@ -30,32 +32,55 @@ sr_includes, sr_lib_dirs, sr_libs, (sr_version,) = [
     for option in
         ("--cflags-only-I", "--libs-only-L", "--libs-only-l", "--modversion")]
 
-includes = ['../../include', '../cxx/include'] + [i[2:] for i in sr_includes]
+includes = ['../../include', '../cxx/include']
+includes += [os.path.join(srcdir, path) for path in includes]
+includes += ['../..', '../../include/libsigrok', '../cxx/include/libsigrok']
+includes += [i[2:] for i in sr_includes]
 libdirs = ['../../.libs', '../cxx/.libs'] + [l[2:] for l in sr_lib_dirs]
-libs = [l[2:] for l in sr_libs]
+libs = [l[2:] for l in sr_libs] + ['sigrokxx']
 
-extension_options = dict(
-    include_dirs = includes,
-    library_dirs = libdirs)
+def vpath(file):
+    vfile = os.path.join(srcdir, file)
+    return vfile if os.path.exists(vfile) else file
+
+def unvpath(file):
+    return os.path.relpath(file, srcdir) if file.startswith(srcdir) else file
+
+class build_py(_build_py):
+    def find_package_modules(self, package, pkg_dir):
+        mods = _build_py.find_package_modules(self, package, pkg_dir)
+        vmods = _build_py.find_package_modules(self, package, vpath(pkg_dir))
+        mods.extend([mod for mod in vmods if mod not in mods])
+        return mods
+    def check_package(self, package, package_dir):
+        return _build_py.check_package(self, package, vpath(package_dir))
+
+class build_ext(_build_ext):
+    def spawn (self, cmd):
+        cmd[1:-1] = [arg if arg.startswith('-') else unvpath(arg) for arg in
+                     cmd[1:-1]]
+        _build_ext.spawn(self, cmd)
+    def swig_sources (self, sources, extension):
+        return [unvpath(src) for src in
+                _build_ext.swig_sources(self, sources, extension)]
 
 setup(
     name = 'libsigrok',
     namespace_packages = ['sigrok'],
-    packages = find_packages(),
+    packages = find_packages(srcdir),
     version = sr_version,
     description = "libsigrok API wrapper",
+    zip_safe = False,
+    script_name = __file__,
     ext_modules = [
-        Extension('sigrok.core._lowlevel',
-            sources = ['sigrok/core/lowlevel.i'],
-            swig_opts = ['-threads', '-I../../include'],
-            libraries = libs + ['sigrok'],
-            **extension_options),
         Extension('sigrok.core._classes',
-            sources = ['sigrok/core/classes.i'],
-            swig_opts = ['-c++', '-threads'] + 
+            sources = [vpath('sigrok/core/classes.i')],
+            swig_opts = ['-c++', '-threads', '-Isigrok/core'] + 
                 ['-I%s' % i for i in includes],
             extra_compile_args = ['-std=c++11'],
-            libraries = libs + ['sigrokxx'],
-            **extension_options)
+            include_dirs = includes,
+            library_dirs = libdirs,
+            libraries = libs)
     ],
+    cmdclass = {'build_py': build_py, 'build_ext': build_ext},
 )