[Numpy-svn] r4171 - in branches/numpy.scons/numpy: distutils/scons scons_fake/ctypesext

numpy-svn@scip... numpy-svn@scip...
Wed Oct 10 05:04:21 CDT 2007


Author: cdavid
Date: 2007-10-10 05:04:06 -0500 (Wed, 10 Oct 2007)
New Revision: 4171

Modified:
   branches/numpy.scons/numpy/distutils/scons/numpyenv.py
   branches/numpy.scons/numpy/scons_fake/ctypesext/__init__.py
Log:
More work for sunos support

Modified: branches/numpy.scons/numpy/distutils/scons/numpyenv.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/numpyenv.py	2007-10-10 09:51:24 UTC (rev 4170)
+++ branches/numpy.scons/numpy/distutils/scons/numpyenv.py	2007-10-10 10:04:06 UTC (rev 4171)
@@ -14,9 +14,11 @@
 from extension_scons import PythonExtension
 
 def pyplat2sconsplat():
-    # XXX: should see how env['PLATFORM'] is defined
+    # XXX: should see how env['PLATFORM'] is defined, make this a dictionary 
     if sys.platform[:5] == 'linux':
         return 'posix'
+    elif sys.platform[:5] == 'sunos':
+        return 'sunos'
     else:
         return sys.platform
 
@@ -124,7 +126,6 @@
         env['ENV']['HOME'] = os.environ['HOME']
     except KeyError:
         pass
-    print env.Dump('TOOLS')
     #print Environment().Dump('TOOLS')
     # Adding custom builder
     env['BUILDERS']['NumpySharedLibrary'] = NumpySharedLibrary

Modified: branches/numpy.scons/numpy/scons_fake/ctypesext/__init__.py
===================================================================
--- branches/numpy.scons/numpy/scons_fake/ctypesext/__init__.py	2007-10-10 09:51:24 UTC (rev 4170)
+++ branches/numpy.scons/numpy/scons_fake/ctypesext/__init__.py	2007-10-10 10:04:06 UTC (rev 4171)
@@ -1,6 +1,10 @@
-from foo_py import foo
+try:
+	from foo_py import foo
+	__all__ = ['foo']
+except ImportError, e:
+	print "Warning: Error importing pyext, error was %s" % e
+	__all__ = []
 
-__all__ = ['foo']
 def test(level=1, verbosity=1):
     from numpy.testing import NumpyTest
     return NumpyTest().test(level, verbosity)



More information about the Numpy-svn mailing list