setup.py: remove extra quotes

[aubio.git] / setup.py

diff --git a/setup.py b/setup.py
index b46e04e..38be7c1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -8,13 +8,22 @@ 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 = []
-define_macros = []
+define_macros = [('AUBIO_VERSION', '%s' % __version__)]
 extra_link_args = []
 
 include_dirs += [ 'python/ext' ]
@@ -28,7 +37,7 @@ except ImportError:
 if sys.platform.startswith('darwin'):
     extra_link_args += ['-framework','CoreFoundation', '-framework','AudioToolbox']
 
-sources = glob.glob(os.path.join('python', 'ext', '*.c'))
+sources = sorted(glob.glob(os.path.join('python', 'ext', '*.c')))
 
 aubio_extension = Extension("aubio._aubio",
     sources,
@@ -38,23 +47,9 @@ aubio_extension = Extension("aubio._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__ += '_libaubio'
-else:
-    # look for aubio headers and lib using pkg-config
-    add_system_aubio(aubio_extension)
-
-
-# generate files if they don't exit
-aubio_extension.sources += generate_external(header, output_path, overwrite = False)
+    if not os.path.isdir(os.path.join('build','src')):
+        pass
+        #__version__ += 'a2' # python only version
 
 classifiers = [
     'Development Status :: 4 - Beta',
@@ -77,8 +72,8 @@ distrib = setup(name='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',
@@ -90,7 +85,7 @@ distrib = setup(name='aubio',
     install_requires = ['numpy'],
     cmdclass = {
         'clean': CleanGenerated,
-        'generate': GenerateCommand,
+        'build_ext': build_ext,
         },
     test_suite = 'nose2.collector.collector',
     )