[Numpy-svn] r4355 - in branches/numpy.scons/numpy: distutils fft linalg numarray random

numpy-svn@scip... numpy-svn@scip...
Tue Oct 30 03:40:59 CDT 2007


Author: cdavid
Date: 2007-10-30 03:40:50 -0500 (Tue, 30 Oct 2007)
New Revision: 4355

Modified:
   branches/numpy.scons/numpy/distutils/misc_util.py
   branches/numpy.scons/numpy/fft/setupscons.py
   branches/numpy.scons/numpy/linalg/setupscons.py
   branches/numpy.scons/numpy/numarray/setupscons.py
   branches/numpy.scons/numpy/random/setupscons.py
Log:
sdist finally works

Modified: branches/numpy.scons/numpy/distutils/misc_util.py
===================================================================
--- branches/numpy.scons/numpy/distutils/misc_util.py	2007-10-30 08:23:23 UTC (rev 4354)
+++ branches/numpy.scons/numpy/distutils/misc_util.py	2007-10-30 08:40:50 UTC (rev 4355)
@@ -1189,6 +1189,9 @@
         # Convert the sconscript name to a relative filename (relative from top
         # setup.py's directory)
         fullsconsname = self.paths(sconscript)[0]
+
+        # XXX: Think about a way to automatically register source files from
+        # scons...
         full_source_files = []
         if source_files:
             full_source_files.extend([self.paths(i)[0] for i in source_files])

Modified: branches/numpy.scons/numpy/fft/setupscons.py
===================================================================
--- branches/numpy.scons/numpy/fft/setupscons.py	2007-10-30 08:23:23 UTC (rev 4354)
+++ branches/numpy.scons/numpy/fft/setupscons.py	2007-10-30 08:40:50 UTC (rev 4355)
@@ -4,8 +4,9 @@
 
     config.add_data_dir('tests')
 
-    # Configure fftpack_lite
-    config.add_sconscript('SConstruct')
+    config.add_sconscript('SConstruct', 
+                          source_files = ['fftpack_litemodule.c', 'fftpack.c',
+                                          'fftpack.h'])
 
     return config
 

Modified: branches/numpy.scons/numpy/linalg/setupscons.py
===================================================================
--- branches/numpy.scons/numpy/linalg/setupscons.py	2007-10-30 08:23:23 UTC (rev 4354)
+++ branches/numpy.scons/numpy/linalg/setupscons.py	2007-10-30 08:40:50 UTC (rev 4355)
@@ -6,10 +6,12 @@
 
     config.add_data_dir('tests')
 
-    print "### Warning:  Using unoptimized lapack ###"
+    config.add_sconscript('SConstruct', 
+                          source_files = ['lapack_litemodule.c',
+                                          'zlapack_lite.c', 'dlapack_lite.c',
+                                          'blas_lite.c', 'dlamch.c',
+                                          'f2c_lite.c','f2c.h'])
 
-    config.add_sconscript('SConstruct')
-
     return config
 
 if __name__ == '__main__':

Modified: branches/numpy.scons/numpy/numarray/setupscons.py
===================================================================
--- branches/numpy.scons/numpy/numarray/setupscons.py	2007-10-30 08:23:23 UTC (rev 4354)
+++ branches/numpy.scons/numpy/numarray/setupscons.py	2007-10-30 08:40:50 UTC (rev 4355)
@@ -5,7 +5,7 @@
     config = Configuration('numarray',parent_package,top_path)
 
     config.add_data_files('numpy/')
-    config.add_sconscript('SConstruct')
+    config.add_sconscript('SConstruct', source_files = ['_capi.c'])
 
     return config
 

Modified: branches/numpy.scons/numpy/random/setupscons.py
===================================================================
--- branches/numpy.scons/numpy/random/setupscons.py	2007-10-30 08:23:23 UTC (rev 4354)
+++ branches/numpy.scons/numpy/random/setupscons.py	2007-10-30 08:40:50 UTC (rev 4355)
@@ -1,3 +1,4 @@
+import glob
 from os.path import join, split
 
 def configuration(parent_package='',top_path=None):
@@ -4,7 +5,18 @@
     from numpy.distutils.misc_util import Configuration, get_mathlibs
     config = Configuration('random',parent_package,top_path)
 
-    config.add_sconscript('SConstruct')
+    source_files = [join('mtrand', i) for i in ['mtrand.c', 
+                                                'mtrand.pxi',
+                                                'numpy.pyx',
+                                                'randomkit.c', 
+                                                'randomkit.h', 
+                                                'Python.pxi', 
+                                                'initarray.c',
+                                                'initarray.h',
+                                                'distributions.c',
+                                                'distributions.h',
+                                                ]]
+    config.add_sconscript('SConstruct', source_files = source_files)
     config.add_data_files(('.', join('mtrand', 'randomkit.h')))
     config.add_data_dir('tests')
 



More information about the Numpy-svn mailing list