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

numpy-svn@scip... numpy-svn@scip...
Sun Oct 21 08:16:46 CDT 2007


Author: cdavid
Date: 2007-10-21 08:16:39 -0500 (Sun, 21 Oct 2007)
New Revision: 4267

Modified:
   branches/numpy.scons/numpy/core/SConstruct
   branches/numpy.scons/numpy/distutils/scons/__init__.py
   branches/numpy.scons/numpy/distutils/scons/numpyenv.py
Log:
Add pythonlib libpath for configuration of core on windows

Modified: branches/numpy.scons/numpy/core/SConstruct
===================================================================
--- branches/numpy.scons/numpy/core/SConstruct	2007-10-20 16:49:13 UTC (rev 4266)
+++ branches/numpy.scons/numpy/core/SConstruct	2007-10-21 13:16:39 UTC (rev 4267)
@@ -1,11 +1,11 @@
-# Last Change: Sat Oct 20 06:00 PM 2007 J
+# Last Change: Sun Oct 21 09:00 PM 2007 J
 # vim:syntax=python
 import os
 import sys
 from os.path import join as pjoin, basename as pbasename, dirname as pdirname
 from copy import deepcopy
 
-from numpy.distutils.scons import get_python_inc
+from numpy.distutils.scons import get_python_inc, get_pythonlib_dir
 from numpy.distutils.scons import GetNumpyEnvironment
 
 from scons_support import CheckBrokenMathlib, define_no_smp, \
@@ -14,6 +14,8 @@
 
 env = GetNumpyEnvironment(ARGUMENTS)
 env.Append(CPPPATH = [get_python_inc()])
+if os.name == 'nt':
+    env.AppendUnique(LIBPATH = [get_pythonlib_dir()])
 
 #=======================
 # Starting Configuration
@@ -38,6 +40,7 @@
         config_sym.append(('SIZEOF_%s' % type.upper(), '%d' % st))
     else:
         config_sym.append(('SIZEOF_%s' % type.upper(), 0))
+
 check_type('short')
 check_type('int')
 check_type('long')

Modified: branches/numpy.scons/numpy/distutils/scons/__init__.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/__init__.py	2007-10-20 16:49:13 UTC (rev 4266)
+++ branches/numpy.scons/numpy/distutils/scons/__init__.py	2007-10-21 13:16:39 UTC (rev 4267)
@@ -2,5 +2,5 @@
 from libinfo_scons import NumpyCheckLib
 from libinfo import get_paths as scons_get_paths
 #from custom_checkers import CheckTypeSize
-from extension import get_python_inc
+from extension import get_python_inc, get_pythonlib_dir
 from utils import isstring

Modified: branches/numpy.scons/numpy/distutils/scons/numpyenv.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/numpyenv.py	2007-10-20 16:49:13 UTC (rev 4266)
+++ branches/numpy.scons/numpy/distutils/scons/numpyenv.py	2007-10-21 13:16:39 UTC (rev 4267)
@@ -135,6 +135,7 @@
     from utils import curry
     NumpyConfigure = curry(env.Configure, conf_dir = pjoin(env['build_dir'], '.sconf'))
     env.NumpyConfigure = NumpyConfigure
+
     # XXX: Huge, ugly hack ! SConsign needs an absolute path or a path
     # relative to where the SConstruct file is. We have to find the path of
     # the build dir relative to the src_dir: we add n .., where n is the number



More information about the Numpy-svn mailing list