[Numpy-svn] r4419 - branches/numpy.scons/numpy/distutils/scons/core

[numpy-svn at scipy.org]

Author: cdavid
Date: 2007-11-08 05:27:50 -0600 (Thu, 08 Nov 2007)
New Revision: 4419

Modified:
   branches/numpy.scons/numpy/distutils/scons/core/default.py
   branches/numpy.scons/numpy/distutils/scons/core/extension_scons.py
Log:
Fix typo in built_with_mstools, causing all kind of headache...

Modified: branches/numpy.scons/numpy/distutils/scons/core/default.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/core/default.py	2007-11-08 09:17:50 UTC (rev 4418)
+++ branches/numpy.scons/numpy/distutils/scons/core/default.py	2007-11-08 11:27:50 UTC (rev 4419)
@@ -165,8 +165,10 @@
         #             ]
         # self.ldflags_static = [ '/nologo']
 
-        cfg = CompilerConfig(optim = ['/Ox', '/DNDEBUG'],
-                             warn = ['/W3', '/Wall'],
+        cfg = CompilerConfig(#optim = ['/Ox', '/DNDEBUG'],
+			     #/Wall is too strong, huge amount of warnings....
+                             #warn = ['/W3', '/Wall'],
+                             warn = ['/W3'],
                              thread = ['/MD', '/GX'], 
                              extra = ['/nologo'])
     elif name == 'mingw':

Modified: branches/numpy.scons/numpy/distutils/scons/core/extension_scons.py
===================================================================
--- branches/numpy.scons/numpy/distutils/scons/core/extension_scons.py	2007-11-08 09:17:50 UTC (rev 4418)
+++ branches/numpy.scons/numpy/distutils/scons/core/extension_scons.py	2007-11-08 11:27:50 UTC (rev 4419)
@@ -13,7 +13,7 @@
 def built_with_mstools(env):
     """Return True if built with MS tools (compiler + linker)."""
     # Handle case where MSVS is found, but mingw is used
-    return env.has_key('MSVS') and not built_with_mingw
+    return env.has_key('MSVS') and not built_with_mingw(env)
 
 def built_with_mingw(env):
     """Return true if built with mingw compiler."""
@@ -35,7 +35,8 @@
 
 def PythonExtension(env, target, source, *args, **kw):
     # XXX Check args and kw
-    # XXX: Some things should not be set here...
+    # XXX: Some things should not be set here... Actually, this whole
+    # thing is a mess.
     if env.has_key('LINKFLAGS'):
         LINKFLAGS = deepcopy(env['LINKFLAGS'])
     else:
@@ -79,6 +80,8 @@
     elif sys.platform == "darwin":
         # XXX: When those should be used ? (which version of Mac OS X ?)
         LINKFLAGS += ' -undefined dynamic_lookup '
+    else:
+	pass
 
     # Use LoadableModule because of Mac OS X
     # ... but scons has a bug (#issue 1669) with mingw and Loadable