[Numpy-svn] r5669 - in branches/1.1.x: . numpy/distutils/command

[numpy-svn at scipy.org]

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

Added:
   branches/1.1.x/setupsconsegg.py
Modified:
   branches/1.1.x/numpy/distutils/command/build.py
   branches/1.1.x/numpy/distutils/command/build_ext.py
Log:
Backport develop mode support for scons build.

Modified: branches/1.1.x/numpy/distutils/command/build.py
===================================================================
--- branches/1.1.x/numpy/distutils/command/build.py	2008-08-20 23:24:24 UTC (rev 5668)
+++ branches/1.1.x/numpy/distutils/command/build.py	2008-08-20 23:44:20 UTC (rev 5669)
@@ -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: branches/1.1.x/numpy/distutils/command/build_ext.py
===================================================================
--- branches/1.1.x/numpy/distutils/command/build_ext.py	2008-08-20 23:24:24 UTC (rev 5668)
+++ branches/1.1.x/numpy/distutils/command/build_ext.py	2008-08-20 23:44:20 UTC (rev 5669)
@@ -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

Copied: branches/1.1.x/setupsconsegg.py (from rev 5668, trunk/setupsconsegg.py)