History

python/: improve build

Paul Brossier committed 13 years ago

Commit ad5203c1 parent 208336b8 files · +47 −38Browse files

Showing the changes to python/setup.py (1 of 8 files). Show all

Unified · Split

python/setup.py+20−5
@@ -1,22 +1,37 @@
11 #! /usr/bin/python
22
33 from distutils.core import setup, Extension
4−from generator import generate_object_files
54 import sys
65 import os.path
76 import numpy
87
98 # read from VERSION
10−for l in open(os.path.join('..','VERSION')).readlines(): exec (l.strip())
9+for l in open('VERSION').readlines(): exec (l.strip())
1110 __version__ = '.'.join \
1211 ([str(x) for x in [AUBIO_MAJOR_VERSION, AUBIO_MINOR_VERSION, AUBIO_PATCH_VERSION]]) \
1312 + AUBIO_VERSION_STATUS
1413
15−library_dirs = ['../build/src', '../src/.libs']
16−include_dirs = ['../build/src', '../src', '.' ]
14+library_dirs = ['../build/src']
15+include_dirs = ['../src'] # aubio.h
16+include_dirs += ['../build/src'] # config.h
17+include_dirs += ['ext']
18+include_dirs += ['gen']
19+#include_dirs += ['../build/src', '../src', '.' ]
20+
1721 library_dirs = filter (lambda x: os.path.isdir(x), library_dirs)
1822 include_dirs = filter (lambda x: os.path.isdir(x), include_dirs)
1923
24+generated_object_files = []
25+
26+output_path = 'gen'
27+
28+if not os.path.isdir(output_path):
29+ from generator import generate_object_files
30+ generated_object_files = generate_object_files(output_path)
31+else:
32+ import glob
33+ generated_object_files = glob.glob(os.path.join(output_path, '*.c'))
34+
2035 aubio_extension = Extension("aubio._aubio", [
2136 "ext/aubiomodule.c",
2237 "ext/aubioproxy.c",
@@ -29,7 +44,7 @@ aubio_extension = Extension("aubio._aubio", [ · 6 unmodified lines
2944 "ext/py-fft.c",
3045 "ext/py-phasevoc.c",
3146 # generated files
32− ] + generate_object_files(),
47+ ] + generated_object_files,
3348 include_dirs = include_dirs + [ numpy.get_include() ],
3449 library_dirs = library_dirs,
3550 libraries=['aubio'])

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t