[Numpy-svn] r4342 - in branches/numpy.scons/numpy/distutils: . command

numpy-svn@scip... numpy-svn@scip...
Mon Oct 29 23:04:38 CDT 2007


Author: cdavid
Date: 2007-10-29 23:04:21 -0500 (Mon, 29 Oct 2007)
New Revision: 4342

Modified:
   branches/numpy.scons/numpy/distutils/command/scons.py
   branches/numpy.scons/numpy/distutils/command/sdist.py
   branches/numpy.scons/numpy/distutils/numpy_distribution.py
Log:
Make SConscripts files known to sdist command

Modified: branches/numpy.scons/numpy/distutils/command/scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/command/scons.py	2007-10-30 03:57:14 UTC (rev 4341)
+++ branches/numpy.scons/numpy/distutils/command/scons.py	2007-10-30 04:04:21 UTC (rev 4342)
@@ -61,7 +61,8 @@
     Example:
         --fcompiler=intel -> ifort on linux, ifl on windows"""
     if compiler.compiler_type == 'intel':
-        return 'intelc'
+        raise NotImplementedError('FIXME: intel fortran compiler name ?')
+        #return 'intelc'
     elif compiler.compiler_type == 'gnu':
         return 'g77'
     elif compiler.compiler_type == 'gnu95':
@@ -122,8 +123,8 @@
     return '"' + path + '"'
 
 class scons(old_build_ext):
-    # XXX: I really do not like the way distutils add attributes "on the fly".
-    # We should eally avoid that and remove all the code which does it before
+    # XXX: I really do not like the way distutils overuses monkey patch. We
+    # should eally avoid that and remove all the code which does it before
     # release.
     # XXX: add an option to the scons command for configuration (auto/force/cache).
     description = "Scons builder"

Modified: branches/numpy.scons/numpy/distutils/command/sdist.py
===================================================================
--- branches/numpy.scons/numpy/distutils/command/sdist.py	2007-10-30 03:57:14 UTC (rev 4341)
+++ branches/numpy.scons/numpy/distutils/command/sdist.py	2007-10-30 04:04:21 UTC (rev 4342)
@@ -24,4 +24,7 @@
                 else: headers.append(h[1])
             self.filelist.extend(headers)
 
+        if dist.has_scons_scripts():
+            self.filelist.extend(dist.get_scons_scripts())
+
         return

Modified: branches/numpy.scons/numpy/distutils/numpy_distribution.py
===================================================================
--- branches/numpy.scons/numpy/distutils/numpy_distribution.py	2007-10-30 03:57:14 UTC (rev 4341)
+++ branches/numpy.scons/numpy/distutils/numpy_distribution.py	2007-10-30 04:04:21 UTC (rev 4342)
@@ -7,3 +7,6 @@
 
     def has_scons_scripts(self):
         return bool(self.scons_scripts)
+
+    def get_scons_scripts(self):
+        return [i[0] for i in self.scons_scripts]



More information about the Numpy-svn mailing list