[Numpy-svn] r5370 - in branches/1.1.x: . numpy/distutils/command numpy/fft numpy/lib numpy/linalg numpy/numarray numpy/random

numpy-svn@scip... numpy-svn@scip...
Wed Jul 9 01:30:40 CDT 2008


Author: cdavid
Date: 2008-07-09 01:30:24 -0500 (Wed, 09 Jul 2008)
New Revision: 5370

Modified:
   branches/1.1.x/
   branches/1.1.x/numpy/distutils/command/scons.py
   branches/1.1.x/numpy/fft/SConstruct
   branches/1.1.x/numpy/lib/SConstruct
   branches/1.1.x/numpy/linalg/SConstruct
   branches/1.1.x/numpy/numarray/SConstruct
   branches/1.1.x/numpy/random/SConstruct
Log:
Merge revision 5258 from trunk: some updates to scons scripts.


Property changes on: branches/1.1.x
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/aligned_alloca:1-5127 /branches/build_with_scons:1-4676 /branches/cdavid:1-5203 /branches/cleanconfig_rtm:1-4677 /branches/distutils-revamp:1-2752 /branches/distutils_scons_command:1-4619 /branches/multicore:1-3687 /branches/numpy.scons:1-4484 /trunk:1-2871
   + /branches/aligned_alloca:1-5127 /branches/build_with_scons:1-4676 /branches/cdavid:1-5257 /branches/cleanconfig_rtm:1-4677 /branches/distutils-revamp:1-2752 /branches/distutils_scons_command:1-4619 /branches/multicore:1-3687 /branches/numpy.scons:1-4484 /trunk:1-2871

Modified: branches/1.1.x/numpy/distutils/command/scons.py
===================================================================
--- branches/1.1.x/numpy/distutils/command/scons.py	2008-07-09 06:25:42 UTC (rev 5369)
+++ branches/1.1.x/numpy/distutils/command/scons.py	2008-07-09 06:30:24 UTC (rev 5370)
@@ -85,6 +85,8 @@
         return 'g77'
     elif compiler.compiler_type == 'gnu95':
         return 'gfortran'
+    elif compiler.compiler_type == 'sun':
+        return 'sunf77'
     else:
         # XXX: Just give up for now, and use generic fortran compiler
         return 'fortran'
@@ -196,6 +198,15 @@
         raise ValueError(msg)
     return common
 
+def is_bootstrapping():
+    import __builtin__
+    try:
+        __builtin__.__NUMPY_SETUP__
+        return True
+    except AttributeError:
+        return False
+        __NUMPY_SETUP__ = False
+
 class scons(old_build_ext):
     # XXX: add an option to the scons command for configuration (auto/force/cache).
     description = "Scons builder"
@@ -303,6 +314,8 @@
         else:
             # nothing to do, just leave it here.
             return
+
+        print "is bootstrapping ? %s" % is_bootstrapping()
         # XXX: when a scons script is missing, scons only prints warnings, and
         # does not return a failure (status is 0). We have to detect this from
         # distutils (this cannot work for recursive scons builds...)
@@ -326,6 +339,11 @@
             post_hooks = self.post_hooks
             pkg_names = self.pkg_names
 
+        if is_bootstrapping():
+            bootstrap = 1
+        else:
+            bootstrap = 0
+
         for sconscript, pre_hook, post_hook, pkg_name in zip(sconscripts,
                                                    pre_hooks, post_hooks,
                                                    pkg_names):
@@ -364,6 +382,7 @@
                 elif int(self.silent) == 3:
                     cmd.append('-s')
             cmd.append('silent=%d' % int(self.silent))
+            cmd.append('bootstrapping=%d' % bootstrap)
             cmdstr = ' '.join(cmd)
             if int(self.silent) < 1:
                 log.info("Executing scons command (pkg is %s): %s ", pkg_name, cmdstr)

Modified: branches/1.1.x/numpy/fft/SConstruct
===================================================================
--- branches/1.1.x/numpy/fft/SConstruct	2008-07-09 06:25:42 UTC (rev 5369)
+++ branches/1.1.x/numpy/fft/SConstruct	2008-07-09 06:30:24 UTC (rev 5370)
@@ -1,8 +1,5 @@
-# Last Change: Thu Oct 18 09:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, scons_get_paths
 
 env = GetNumpyEnvironment(ARGUMENTS)

Modified: branches/1.1.x/numpy/lib/SConstruct
===================================================================
--- branches/1.1.x/numpy/lib/SConstruct	2008-07-09 06:25:42 UTC (rev 5369)
+++ branches/1.1.x/numpy/lib/SConstruct	2008-07-09 06:30:24 UTC (rev 5370)
@@ -1,8 +1,5 @@
-# Last Change: Thu Oct 18 09:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, scons_get_paths
 
 env = GetNumpyEnvironment(ARGUMENTS)

Modified: branches/1.1.x/numpy/linalg/SConstruct
===================================================================
--- branches/1.1.x/numpy/linalg/SConstruct	2008-07-09 06:25:42 UTC (rev 5369)
+++ branches/1.1.x/numpy/linalg/SConstruct	2008-07-09 06:30:24 UTC (rev 5370)
@@ -1,11 +1,7 @@
-# Last Change: Fri Nov 16 05:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
 import os.path
 
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-
-from numpy.distutils.misc_util import get_numpy_include_dirs, get_mathlibs
 from numscons import GetNumpyEnvironment, scons_get_paths, \
                      scons_get_mathlib
 from numscons import CheckF77LAPACK
@@ -27,7 +23,7 @@
 
 sources = ['lapack_litemodule.c']
 if not use_lapack:
-    sources.extend(['zlapack_lite.c', 'dlapack_lite.c', 'blas_lite.c',
-                    'dlamch.c', 'f2c_lite.c'])
+    sources.extend(['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c',
+                    'blas_lite.c', 'dlamch.c', 'f2c_lite.c'])
 lapack_lite = env.NumpyPythonExtension('lapack_lite', source = sources)
             

Modified: branches/1.1.x/numpy/numarray/SConstruct
===================================================================
--- branches/1.1.x/numpy/numarray/SConstruct	2008-07-09 06:25:42 UTC (rev 5369)
+++ branches/1.1.x/numpy/numarray/SConstruct	2008-07-09 06:30:24 UTC (rev 5370)
@@ -1,8 +1,5 @@
-# Last Change: Fri Oct 19 09:00 AM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-from numpy.distutils.misc_util import get_numpy_include_dirs
 from numscons import GetNumpyEnvironment, scons_get_paths
 
 env = GetNumpyEnvironment(ARGUMENTS)

Modified: branches/1.1.x/numpy/random/SConstruct
===================================================================
--- branches/1.1.x/numpy/random/SConstruct	2008-07-09 06:25:42 UTC (rev 5369)
+++ branches/1.1.x/numpy/random/SConstruct	2008-07-09 06:30:24 UTC (rev 5370)
@@ -1,11 +1,7 @@
-# Last Change: Tue Nov 13 11:00 PM 2007 J
+# Last Change: Tue May 20 05:00 PM 2008 J
 # vim:syntax=python
 import os
 
-import __builtin__
-__builtin__.__NUMPY_SETUP__ = True
-
-from numpy.distutils.misc_util import get_numpy_include_dirs, get_mathlibs
 from numscons import GetNumpyEnvironment, scons_get_paths, \
                                   scons_get_mathlib
 



More information about the Numpy-svn mailing list