[Numpy-svn] r4459 - in branches/numpy.scons/numpy: core distutils

numpy-svn@scip... numpy-svn@scip...
Thu Nov 15 04:21:51 CST 2007


Author: cdavid
Date: 2007-11-15 04:21:46 -0600 (Thu, 15 Nov 2007)
New Revision: 4459

Modified:
   branches/numpy.scons/numpy/core/setup.py
   branches/numpy.scons/numpy/distutils/setup.py
Log:
Correctly add numpyconfig.h to the public header list for distutils build

Modified: branches/numpy.scons/numpy/core/setup.py
===================================================================
--- branches/numpy.scons/numpy/core/setup.py	2007-11-15 10:06:28 UTC (rev 4458)
+++ branches/numpy.scons/numpy/core/setup.py	2007-11-15 10:21:46 UTC (rev 4459)
@@ -156,7 +156,7 @@
         if incl_dir not in config.numpy_include_dirs:
             config.numpy_include_dirs.append(incl_dir)
 
-        config.add_data_files((header_dir,target))
+        #config.add_data_files((header_dir,target))
         return target
 
     def generate_numpyconfig_h(ext, build_dir):
@@ -190,6 +190,7 @@
             print target_f.read()
             target_f.close()
             print 'EOF'
+        config.add_data_files((header_dir,target))
         return target
                                 
     def generate_api_func(module_name):

Modified: branches/numpy.scons/numpy/distutils/setup.py
===================================================================
--- branches/numpy.scons/numpy/distutils/setup.py	2007-11-15 10:06:28 UTC (rev 4458)
+++ branches/numpy.scons/numpy/distutils/setup.py	2007-11-15 10:21:46 UTC (rev 4459)
@@ -7,6 +7,7 @@
     config.add_subpackage('scons')
     config.add_subpackage('fcompiler')
     config.add_data_dir('tests')
+    config.add_data_dir('scons-local')
     config.add_data_files('site.cfg')
     config.make_config_py()
     return config



More information about the Numpy-svn mailing list