setup.py: clean up, remove ~

[aubio.git] / setup.py

diff --git a/setup.py b/setup.py
index 9535a3b..8c9552b 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 
 import sys, os.path, glob
-import numpy
 from setuptools import setup, Extension
 from python.lib.moresetuptools import *
 # function to generate gen/*.{c,h}
@@ -9,9 +8,18 @@ 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 = []
@@ -20,7 +28,11 @@ 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']
@@ -50,9 +62,6 @@ else:
     add_system_aubio(aubio_extension)
 
 
-# generate files if they don't exit
-aubio_extension.sources += generate_external(header, output_path, overwrite = False)
-
 classifiers = [
     'Development Status :: 4 - Beta',
     'Environment :: Console',
@@ -68,6 +77,14 @@ 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'],
@@ -88,6 +105,7 @@ distrib = setup(name='aubio',
     cmdclass = {
         'clean': CleanGenerated,
         'generate': GenerateCommand,
+        'build_ext': build_ext,
         },
     test_suite = 'nose2.collector.collector',
     )