attempt to handle relative directories

example/dsodemo/cli.py

 
 from __future__ import print_function
 
-from . import dtest
+import sys, os
+
+def fixpath():
+    path = os.environ.get('PATH', '').split(os.pathsep)
+    moddir = os.path.dirname(__file__)
+    path.append(os.path.join(moddir, 'lib'))
+    os.environ['PATH'] = os.pathsep.join(path)
+
+if sys.platform == "win32":
+    fixpath()
+
+from .ext import dtest
 
 if __name__=='__main__':
     print(dtest.foo())

example/extension.cpp

@@ -28,7 +28,7 @@ static struct PyMethodDef dtest_methods[] = {
 #if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef dtestymodule = {
   PyModuleDef_HEAD_INIT,
-    "dsodemo.dtest",
+    "dsodemo.ext.dtest",
     NULL,
     -1,
     dtest_methods,
@@ -47,7 +47,7 @@ PyMOD(dtest)
 #if PY_MAJOR_VERSION >= 3
         PyObject *mod = PyModule_Create(&dtestymodule);
 #else
-        PyObject *mod = Py_InitModule("dsodemo.dtest", dtest_methods);
+        PyObject *mod = Py_InitModule("dsodemo.ext.dtest", dtest_methods);
 #endif
         if(mod) {
         }

example/setup.py

 #!/usr/bin/env python
 
-from setuptools import Extension
-from setuptools_dso import DSO, build_dso, build_ext, setup
+from setuptools_dso import DSO, Extension, build_dso, build_ext, setup
 
-dso = DSO('dsodemo.demo', ['foo.c', 'bar.cpp'],
+dso = DSO('dsodemo.lib.demo', ['foo.c', 'bar.cpp'],
     define_macros = [('BUILD_FOO', None)],
     extra_compile_args = {
         '*':['-DALL'],
@@ -13,15 +12,14 @@ dso = DSO('dsodemo.demo', ['foo.c', 'bar.cpp'],
     soversion='1.0',
 )
 
-ext = Extension('dsodemo.dtest', ['extension.cpp'],
-    library_dirs=['dsodemo'],
-    libraries=['demo'],
+ext = Extension('dsodemo.ext.dtest', ['extension.cpp'],
+    dsos=['dsodemo.lib.demo'],
 )
 
 setup(
     name='dsodemo',
     version="0.1",
-    packages=['dsodemo'],
+    packages=['dsodemo', 'dsodemo.ext'],
     ext_modules = [ext],
     x_dsos = [dso],
 )

src/setuptools_dso/__init__.py

 
 from setuptools import setup as _setup
-from .dsocmd import DSO, build_dso, build_ext
+from .dsocmd import DSO, Extension, build_dso, build_ext
 
 def setup(**kws):
     cmdclass = kws.get('cmdclass', {})

src/setuptools_dso/dsocmd.py

 import sys
 import os
 import platform
+import glob
 
 from collections import defaultdict
+from importlib import import_module # say that three times fast...
 
-from setuptools import Command, Distribution, Extension
+from setuptools import Command, Distribution, Extension as _Extension
 from setuptools.command.build_ext import build_ext as _build_ext
 
 from distutils.sysconfig import customize_compiler
@@ -22,14 +24,21 @@ def massage_dir_list(bdir, dirs):
     dirs.extend([os.path.join(bdir, D) for D in dirs if not os.path.isabs(D)])
     return dirs
 
-class DSO(Extension):
+class Extension(_Extension):
+    def __init__(self, name, sources,
+                 dsos=None,
+                 **kws):
+        _Extension.__init__(self, name, sources, **kws)
+        self.dsos = dsos or []
+
+class DSO(_Extension):
     def __init__(self, name, sources,
                  soversion=None,
                  extra_compile_args=None,
                  **kws):
         if not isinstance(extra_compile_args, dict):
             extra_compile_args = {'*':extra_compile_args}
-        Extension.__init__(self, name, sources, extra_compile_args=extra_compile_args, **kws)
+        _Extension.__init__(self, name, sources, extra_compile_args=extra_compile_args, **kws)
         self.soversion = soversion or None
 
 class build_dso(Command):
@@ -221,10 +230,73 @@ class build_ext(_build_ext):
 
         ext.extra_link_args = ext.extra_link_args or []
 
-        if platform.system() == 'Linux':
-            ext.extra_link_args.extend(['-Wl,-rpath,$ORIGIN'])
-        elif sys.platform == 'darwin':
-            pass # TODO: avoid otool games with: -dylib_file <install_name>:@loader_path/<my_rel_path>
+        mypath = os.path.join(*ext.name.split('.')[:-1])
+
+        for dso in getattr(ext, 'dsos', []):
+            log.debug("Will link against DSO %s"%dso)
+
+            parts = dso.split('.')
+            dsopath = os.path.join(*parts[:-1])
+            if sys.platform == "win32":
+                libname = parts[-1]+'.dll'
+            elif sys.platform == 'darwin':
+                libname = 'lib%s.dylib'%parts[-1] # find the plain version first.
+            else:
+                libname = 'lib%s.so'%parts[-1]
+
+            dsosearch = [os.path.join(self.build_lib, *parts[:-1])] # maybe we just built it
+
+            try:
+                # assume this DSO lives in an external package.
+                dsobase = os.path.dirname(import_module(parts[0]).__file__)
+                dsodir = os.path.join(dsobase, *parts[1:-1])
+                dsosearch.append(dsodir)
+            except ImportError:
+                pass
+
+            found = False
+            for candidate in dsosearch:
+                C = os.path.join(candidate, libname)
+                if not os.path.isfile(C):
+                    log.debug("  Not %s"%C)
+                else:
+                    log.debug("  Found %s"%C)
+                    ext.library_dirs.append(candidate)
+
+                    if sys.platform == 'darwin':
+                        # now find the full name of the library (including major version)
+                        full = glob.glob(os.path.join(candidate, 'lib%s.*.dylib'%parts[-1]))
+                        if len(full)==0:
+                            fullname = libname
+                        elif len(full)==1:
+                            fullname = os.path.basename(full[0])
+                        else:
+                            raise RuntimeError("Something wierd happened.  Please report. %s"%full)
+
+                        # -dylib_file A:B asks the linker to do the equivlaent of:
+                        #     install_name_tool -change A B
+                        ext.extra_link_args.extend([
+                            '-v',
+                            '-dylib_file',
+                            '@loader_path/%s:@loader_path/%s/%s'%(fullname, os.path.relpath(dsopath, mypath), fullname),
+                        ])
+
+                    found = True
+                    break
+
+            if not found:
+                raise RuntimeError("Unable to find DSO %s needed by extension %s"%(dso, ext.name))
+
+            ext.libraries.append(parts[-1])
+
+            if platform.system() == 'Linux':
+                ext.extra_link_args.extend(['-Wl,-rpath,$ORIGIN/%s'%os.path.relpath(dsopath, mypath)])
+
+            elif sys.platform == 'darwin':
+                pass # TODO: avoid otool games with: -dylib_file <install_name>:@loader_path/<my_rel_path>
+
+            else:
+                pass # PE has nothing like rpath or install_name, so will have to set PATH when loading
 
         # the Darwin linker errors if given non-existant directories :(
         [self.mkpath(D) for D in ext.library_dirs]