Changeset ad5203c for python/setup.py

Timestamp:

Mar 5, 2013, 5:46:48 PM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

63f6c13

Parents:

208336b

Message:

python/: improve build

File:

• python/setup.py (modified) (3 diffs)

python/setup.py

@@ -2 +2 @@
 
 from distutils.core import setup, Extension
-from generator import generate_object_files
 import sys
 import os.path
@@ -8 +7 @@
 
 # read from VERSION
-for l in open(os.path.join('..','VERSION')).readlines(): exec (l.strip())
+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
 
-library_dirs = ['../build/src', '../src/.libs']
-include_dirs = ['../build/src', '../src', '.' ]
+library_dirs = ['../build/src']
+include_dirs = ['../src'] # aubio.h
+include_dirs += ['../build/src'] # config.h
+include_dirs += ['ext']
+include_dirs += ['gen']
+#include_dirs += ['../build/src', '../src', '.' ]
+
 library_dirs = filter (lambda x: os.path.isdir(x), library_dirs)
 include_dirs = filter (lambda x: os.path.isdir(x), include_dirs)
+
+generated_object_files = []
+
+output_path = 'gen'
+
+if not os.path.isdir(output_path):
+    from generator import generate_object_files
+    generated_object_files = generate_object_files(output_path)
+else:
+    import glob
+    generated_object_files = glob.glob(os.path.join(output_path, '*.c'))
 
 aubio_extension = Extension("aubio._aubio", [
@@ -30 +45 @@
             "ext/py-phasevoc.c",
             # generated files
-            ] + generate_object_files(),
+            ] + generated_object_files,
         include_dirs = include_dirs + [ numpy.get_include() ],
         library_dirs = library_dirs,