[Numpy-svn] r6204 - trunk/numpy/distutils
numpy-svn at scipy.org
numpy-svn at scipy.org
Sat Dec 27 05:57:09 EST 2008
Author: cdavid
Date: 2008-12-27 04:57:05 -0600 (Sat, 27 Dec 2008)
New Revision: 6204
Modified:
trunk/numpy/distutils/mingw32ccompiler.py
Log:
Fix manifest generation.
Modified: trunk/numpy/distutils/mingw32ccompiler.py
===================================================================
--- trunk/numpy/distutils/mingw32ccompiler.py 2008-12-27 10:43:41 UTC (rev 6203)
+++ trunk/numpy/distutils/mingw32ccompiler.py 2008-12-27 10:57:05 UTC (rev 6204)
@@ -244,28 +244,25 @@
# XXX: ideally, we should use exactly the same version as used by python. I
# submitted a patch to get this version, but it was only included for python
# 2.6.1 and above. So for versions below, we use a "best guess".
-_MSVCRVER_TO_FULLVER = {'90': None}
+_MSVCRVER_TO_FULLVER = {}
+if sys.platform == 'win32':
+ try:
+ import msvcrt
+ if hasattr(msvcrt, "CRT_ASSEMBLY_VERSION"):
+ _MSVCRVER_TO_FULLVER['90'] = msvcrt.CRT_ASSEMBLY_VERSION
+ else:
+ _MSVCRVER_TO_FULLVER['90'] = "9.0.21022.8"
+ except ImportError:
+ # If we are here, means python was not built with MSVC. Not sure what to do
+ # in that case: manifest building will fail, but it should not be used in
+ # that case anyway
+ log.warn('Cannot import msvcrt: using manifest will not be possible')
-def msvcrt_version(num):
- k = _MSVCRVER_TO_FULLVER[num]
- if not k:
- try:
- import msvcrt
- if hasattr(msvcrt, "CRT_ASSEMBLY_VERSION"):
- _MSVCRVER_TO_FULLVER['90'] = msvcrt.CRT_ASSEMBLY_VERSION
- else:
- _MSVCRVER_TO_FULLVER['90'] = "9.0.21022.8"
- except ImportError:
- # If we are here, means python was not built with MSVC. Not sure what to do
- # in that case: manifest building will fail, but it should not be used in
- # that case anyway
- log.warn('Cannot import msvcrt: using manifest will not be possible')
-
def msvc_manifest_xml(maj, min):
"""Given a major and minor version of the MSVCR, returns the
corresponding XML file."""
try:
- fullver = msvcrt_version(str(maj * 10 + min))
+ fullver = _MSVCRVER_TO_FULLVER[str(maj * 10 + min)]
except KeyError:
raise ValueError("Version %d,%d of MSVCRT not supported yet" \
% (maj, min))
More information about the Numpy-svn
mailing list