From 06ea402528b0cdd228a16ce77d2aafff44ede61e Mon Sep 17 00:00:00 2001 From: David Cournapeau Date: Wed, 20 Aug 2008 23:24:24 +0000 Subject: Run scons command in build_ext instead of build. setuptools develop run build_ext inplace, not build, so develop command in setuptools would not call the scons command. Now, the develop mode should work with numscons. --- numpy/distutils/command/build.py | 3 --- numpy/distutils/command/build_ext.py | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'numpy/distutils/command') diff --git a/numpy/distutils/command/build.py b/numpy/distutils/command/build.py index 2f5dc31ab..5d986570c 100644 --- a/numpy/distutils/command/build.py +++ b/numpy/distutils/command/build.py @@ -34,7 +34,4 @@ class build(old_build): 'scripts' + plat_specifier) def run(self): - # Make sure that scons based extensions are complete. - self.run_command('scons') - old_build.run(self) diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 68d0aff7f..ea5913a67 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -217,6 +217,11 @@ class build_ext (old_build_ext): # Build extensions self.build_extensions() + # Make sure that scons based extensions are complete. + if self.inplace: + self.reinitialize_command('scons', inplace=1) + self.run_command('scons') + def swig_sources(self, sources): # Do nothing. Swig sources have beed handled in build_src command. return sources -- cgit v1.2.1