[Numpy-svn] r4694 - in branches/build_with_scons/numpy/core: . include/numpy

numpy-svn@scip... numpy-svn@scip...
Sun Jan 6 08:18:57 CST 2008


Author: cdavid
Date: 2008-01-06 08:18:51 -0600 (Sun, 06 Jan 2008)
New Revision: 4694

Added:
   branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
Modified:
   branches/build_with_scons/numpy/core/SConstruct
   branches/build_with_scons/numpy/core/setupscons.py
Log:
More work on building numpy.core with scons (still does not work)

Modified: branches/build_with_scons/numpy/core/SConstruct
===================================================================
--- branches/build_with_scons/numpy/core/SConstruct	2008-01-06 14:18:02 UTC (rev 4693)
+++ branches/build_with_scons/numpy/core/SConstruct	2008-01-06 14:18:51 UTC (rev 4694)
@@ -1,4 +1,4 @@
-# Last Change: Sun Jan 06 07:00 PM 2008 J
+# Last Change: Sun Jan 06 10:00 PM 2008 J
 # vim:syntax=python
 import os
 import sys
@@ -143,7 +143,7 @@
     build_blasdot = 0
 
 config.Finish()
-write_info(env)
+#write_info(env)
 
 #==========
 #  Build

Added: branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
===================================================================
--- branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-06 14:18:02 UTC (rev 4693)
+++ branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-06 14:18:51 UTC (rev 4694)
@@ -0,0 +1,23 @@
+#define NPY_SIZEOF_SHORT        @SIZEOF_SHORT@
+#define NPY_SIZEOF_INT          @SIZEOF_INT@
+#define NPY_SIZEOF_LONG         @SIZEOF_LONG@
+#define NPY_SIZEOF_FLOAT        @SIZEOF_FLOAT@
+#define NPY_SIZEOF_DOUBLE       @SIZEOF_DOUBLE@
+#define NPY_SIZEOF_LONGDOUBLE   @SIZEOF_LONG_DOUBLE@
+#define NPY_SIZEOF_PY_INTPTR_T  @SIZEOF_PY_INTPTR_T@
+
+#define NPY_NOSMP        @NPY_NOSMP@
+
+/* XXX: this has really nothing to do in a config file... */
+#define NPY_MATHLIB      @MATHLIB@
+
+/* XXX: this has to be done outside config files !!!! */
+#ifdef PY_LONG_LONG
+        #define NPY_SIZEOF_LONGLONG @SIZEOF_PY_LONG_LONG@
+        #define NPY_SIZEOF_PY_LONG_LONG @SIZEOF_PY_LONG_LONG@
+#endif
+
+#ifndef CHAR_BIT
+        #error Configuration for undefined CHAR_BIT is not supported, contact the maintainter
+        #define CHAR_BIT      @CHAR_BIT@
+#endif

Modified: branches/build_with_scons/numpy/core/setupscons.py
===================================================================
--- branches/build_with_scons/numpy/core/setupscons.py	2008-01-06 14:18:02 UTC (rev 4693)
+++ branches/build_with_scons/numpy/core/setupscons.py	2008-01-06 14:18:51 UTC (rev 4694)
@@ -2,8 +2,11 @@
 import sys
 import glob
 from os.path import join, basename
+
 from numpy.distutils import log
 
+from numscons import get_scons_build_dir
+
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration,dot_join
     from numpy.distutils.system_info import get_info, default_lib_dirs
@@ -33,7 +36,7 @@
 
     # Add generated files to distutils...
     def add_config_header():
-        scons_build_dir = config.get_scons_build_dir()
+        scons_build_dir = get_scons_build_dir()
         # XXX: I really have to think about how to communicate path info
         # between scons and distutils, and set the options at one single
         # location.
@@ -43,7 +46,7 @@
             config.numpy_include_dirs.append(incl_dir)
 
     def add_numpyconfig_header():
-        scons_build_dir = config.get_scons_build_dir()
+        scons_build_dir = get_scons_build_dir()
         # XXX: I really have to think about how to communicate path info
         # between scons and distutils, and set the options at one single
         # location.
@@ -54,7 +57,7 @@
         config.add_data_files((header_dir, target)) 
 
     def add_array_api():
-        scons_build_dir = config.get_scons_build_dir()
+        scons_build_dir = get_scons_build_dir()
         # XXX: I really have to think about how to communicate path info
         # between scons and distutils, and set the options at one single
         # location.
@@ -64,7 +67,7 @@
                               (header_dir, t_file))
 
     def add_ufunc_api():
-        scons_build_dir = config.get_scons_build_dir()
+        scons_build_dir = get_scons_build_dir()
         # XXX: I really have to think about how to communicate path info
         # between scons and distutils, and set the options at one single
         # location.



More information about the Numpy-svn mailing list