[Numpy-svn] r5277 - trunk/numpy/numarray

[numpy-svn at scipy.org]

Author: cdavid
Date: 2008-06-12 04:55:30 -0500 (Thu, 12 Jun 2008)
New Revision: 5277

Added:
   trunk/numpy/numarray/SConscript
   trunk/numpy/numarray/SConstruct
Removed:
   trunk/numpy/numarray/SConstruct
Log:
Adapt numpy.numarray to new build dir convention.

Copied: trunk/numpy/numarray/SConscript (from rev 5266, trunk/numpy/numarray/SConstruct)
===================================================================
--- trunk/numpy/numarray/SConstruct	2008-06-12 05:45:18 UTC (rev 5266)
+++ trunk/numpy/numarray/SConscript	2008-06-12 09:55:30 UTC (rev 5277)
@@ -0,0 +1,9 @@
+# Last Change: Thu Jun 12 06:00 PM 2008 J
+# vim:syntax=python
+from numscons import GetNumpyEnvironment, scons_get_paths
+
+env = GetNumpyEnvironment(ARGUMENTS)
+env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
+env.Append(CPPPATH = ['numpy'])
+
+_capi = env.DistutilsPythonExtension('_capi', source = ['_capi.c'])

Deleted: trunk/numpy/numarray/SConstruct
===================================================================
--- trunk/numpy/numarray/SConstruct	2008-06-12 09:49:16 UTC (rev 5276)
+++ trunk/numpy/numarray/SConstruct	2008-06-12 09:55:30 UTC (rev 5277)
@@ -1,9 +0,0 @@
-# Last Change: Tue May 20 05:00 PM 2008 J
-# vim:syntax=python
-from numscons import GetNumpyEnvironment, scons_get_paths
-
-env = GetNumpyEnvironment(ARGUMENTS)
-env.Append(CPPPATH = scons_get_paths(env['include_bootstrap']))
-env.Append(CPPPATH = env['src_dir'])
-
-_capi = env.NumpyPythonExtension('_capi', source = ['_capi.c'])

Copied: trunk/numpy/numarray/SConstruct (from rev 5274, trunk/numpy/lib/SConstruct)