Merge pull request #125 from bastibe/lib-handling

Move DLLs to submodule

Author: bastibe

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "pysoundfile_data"]
+	path = pysoundfile_data
+	url = https://github.com/bastibe/libsndfile-binaries.git

pysoundfile_data

@@ -1,19 +1,27 @@
 #!/usr/bin/env python
-import sys
+import os
+from platform import architecture
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
-from sys import platform
-from platform import architecture
-import shutil
+import sys
+
+# environment variables for cross-platform package creation
+platform = os.environ.get('PYSOUNDFILE_PLATFORM', sys.platform)
+architecture0 = os.environ.get('PYSOUNDFILE_ARCHITECTURE', architecture()[0])
+
+if platform == 'darwin':
+    libname = 'libsndfile.dylib'
+elif platform == 'win32':
+    libname = 'libsndfile' + architecture0 + '.dll'
+else:
+    libname = None
 
-if platform == 'win32' and architecture()[0] == '32bit':
-    shutil.copy2('win/sndfile32.dll', 'win/sndfile.dll')
-    sndfile = [('', ['win/sndfile.dll', 'win/sndfile_license'])]
-elif platform == 'win32' and architecture()[0] == '64bit':
-    shutil.copy2('win/sndfile64.dll', 'win/sndfile.dll')
-    sndfile = [('', ['win/sndfile.dll', 'win/sndfile_license'])]
+if libname:
+    packages = ['pysoundfile_data']
+    package_data = {'pysoundfile_data': [libname, 'COPYING']}
 else:
-    sndfile = []
+    packages = None
+    package_data = None
 
 
 class PyTest(TestCommand):
@@ -44,7 +52,8 @@ def run_tests(self):
     url='https://github.com/bastibe/PySoundFile',
     keywords=['audio', 'libsndfile'],
     py_modules=['soundfile'],
-    data_files=sndfile,
+    packages=packages,
+    package_data=package_data,
     license='BSD 3-Clause License',
     install_requires=['numpy',
                       'cffi>=0.6'],

setup.py

@@ -245,7 +245,19 @@
     _np.dtype('int16'): 'short'
 }
 
-_snd = _ffi.dlopen('sndfile')
+try:
+    _snd = _ffi.dlopen('sndfile')
+except OSError as err:
+    if _sys.platform == 'darwin':
+        _libname = 'libsndfile.dylib'
+    elif _sys.platform == 'win32':
+        from platform import architecture as _architecture
+        _libname = 'libsndfile' + _architecture()[0] + '.dll'
+    else:
+        raise
+    _snd = _ffi.dlopen(_os.path.join(
+        _os.path.dirname(_os.path.abspath(__file__)),
+        'pysoundfile_data', _libname))
 
 
 def read(file, frames=-1, start=0, stop=None, dtype='float64', always_2d=True,