setup.py: use 0.4.3a2

[aubio.git] / setup.py

diff --git a/setup.py b/setup.py
index 269f15c..7fc102c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,25 @@
 #! /usr/bin/env python
 
-import sys
-import os.path
-import numpy
+import sys, os.path, glob
 from setuptools import setup, Extension
-from python.lib.moresetuptools import CleanGenerated, GenerateCommand
+from python.lib.moresetuptools import *
 # function to generate gen/*.{c,h}
 from python.lib.gen_external import generate_external, header, output_path
 
 # read from VERSION
 for l in open('VERSION').readlines(): exec (l.strip())
-__version__ = '.'.join \
-        ([str(x) for x in [AUBIO_MAJOR_VERSION, AUBIO_MINOR_VERSION, AUBIO_PATCH_VERSION]]) \
-        + AUBIO_VERSION_STATUS
+
+if AUBIO_MAJOR_VERSION is None or AUBIO_MINOR_VERSION is None \
+        or AUBIO_PATCH_VERSION is None:
+    raise SystemError("Failed parsing VERSION file.")
+
+__version__ = '.'.join(map(str, [AUBIO_MAJOR_VERSION,
+                                 AUBIO_MINOR_VERSION,
+                                 AUBIO_PATCH_VERSION]))
+if AUBIO_VERSION_STATUS is not None:
+    if AUBIO_VERSION_STATUS.startswith('~'):
+        AUBIO_VERSION_STATUS = AUBIO_VERSION_STATUS[1:]
+    __version__ += AUBIO_VERSION_STATUS
 
 include_dirs = []
 library_dirs = []
@@ -21,35 +28,39 @@ extra_link_args = []
 
 include_dirs += [ 'python/ext' ]
 include_dirs += [ output_path ] # aubio-generated.h
-include_dirs += [ numpy.get_include() ]
+try:
+    import numpy
+    include_dirs += [ numpy.get_include() ]
+except ImportError:
+    pass
 
 if sys.platform.startswith('darwin'):
     extra_link_args += ['-framework','CoreFoundation', '-framework','AudioToolbox']
 
-if os.path.isfile('src/aubio.h'):
-    define_macros += [('USE_LOCAL_AUBIO', 1)]
-    include_dirs += ['src'] # aubio.h
-    library_dirs += ['build/src']
+sources = glob.glob(os.path.join('python', 'ext', '*.c'))
 
-aubio_extension = Extension("aubio._aubio", [
-    "python/ext/aubiomodule.c",
-    "python/ext/aubioproxy.c",
-    "python/ext/ufuncs.c",
-    "python/ext/py-musicutils.c",
-    "python/ext/py-cvec.c",
-    "python/ext/py-filter.c",
-    "python/ext/py-filterbank.c",
-    "python/ext/py-fft.c",
-    "python/ext/py-phasevoc.c",
-    "python/ext/py-source.c",
-    "python/ext/py-sink.c",
-    # generate files if they don't exit
-    ] + generate_external(header, output_path, overwrite = False),
+aubio_extension = Extension("aubio._aubio",
+    sources,
     include_dirs = include_dirs,
     library_dirs = library_dirs,
     extra_link_args = extra_link_args,
-    define_macros = define_macros,
-    libraries=['aubio'])
+    define_macros = define_macros)
+
+if os.path.isfile('src/aubio.h'):
+    # if aubio headers are found in this directory
+    add_local_aubio_header(aubio_extension)
+    # was waf used to build the shared lib?
+    if os.path.isdir(os.path.join('build','src')):
+        # link against build/src/libaubio, built with waf
+        add_local_aubio_lib(aubio_extension)
+    else:
+        # add libaubio sources and look for optional deps with pkg-config
+        add_local_aubio_sources(aubio_extension)
+        __version__ += 'a2' # pypi version
+else:
+    # look for aubio headers and lib using pkg-config
+    add_system_aubio(aubio_extension)
+
 
 classifiers = [
     'Development Status :: 4 - Beta',
@@ -66,14 +77,22 @@ classifiers = [
     'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
     ]
 
+from distutils.command.build_ext import build_ext as _build_ext
+class build_ext(_build_ext):
+
+    def build_extension(self, extension):
+        # generate files python/gen/*.c, python/gen/aubio-generated.h
+        extension.sources += generate_external(header, output_path, overwrite = False)
+        return _build_ext.build_extension(self, extension)
+
 distrib = setup(name='aubio',
     version = __version__,
     packages = ['aubio'],
     package_dir = {'aubio':'python/lib/aubio'},
     scripts = ['python/scripts/aubiocut'],
     ext_modules = [aubio_extension],
-    description = 'interface to the aubio library',
-    long_description = 'interface to the aubio library',
+    description = 'a collection of tools for music analysis',
+    long_description = 'a collection of tools for music analysis',
     license = 'GNU/GPL version 3',
     author = 'Paul Brossier',
     author_email = 'piem@aubio.org',
@@ -86,6 +105,7 @@ distrib = setup(name='aubio',
     cmdclass = {
         'clean': CleanGenerated,
         'generate': GenerateCommand,
+        'build_ext': build_ext,
         },
     test_suite = 'nose2.collector.collector',
     )