[Numpy-svn] r5668 - trunk/numpy/distutils/command

numpy-svn@scip... numpy-svn@scip...
Wed Aug 20 18:24:41 CDT 2008


Author: cdavid
Date: 2008-08-20 18:24:24 -0500 (Wed, 20 Aug 2008)
New Revision: 5668

Modified:
   trunk/numpy/distutils/command/build.py
   trunk/numpy/distutils/command/build_ext.py
Log:
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.



Modified: trunk/numpy/distutils/command/build.py
===================================================================
--- trunk/numpy/distutils/command/build.py	2008-08-20 23:02:44 UTC (rev 5667)
+++ trunk/numpy/distutils/command/build.py	2008-08-20 23:24:24 UTC (rev 5668)
@@ -34,7 +34,4 @@
                                               'scripts' + plat_specifier)
 
     def run(self):
-        # Make sure that scons based extensions are complete.
-        self.run_command('scons')
-
         old_build.run(self)

Modified: trunk/numpy/distutils/command/build_ext.py
===================================================================
--- trunk/numpy/distutils/command/build_ext.py	2008-08-20 23:02:44 UTC (rev 5667)
+++ trunk/numpy/distutils/command/build_ext.py	2008-08-20 23:24:24 UTC (rev 5668)
@@ -217,6 +217,11 @@
         # 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



More information about the Numpy-svn mailing list