2008/11/17 <[EMAIL PROTECTED]>:
> Author: cdavid
> Date: 2008-11-17 06:03:57 -0600 (Mon, 17 Nov 2008)
> New Revision: 6056
>
> Modified:
> branches/visualstudio_manifest/numpy/distutils/command/config.py
> Log:
> Detect whether config link needs embedding the manifest for the MSVC runtime.
>
> Modified: branches/visualstudio_manifest/numpy/distutils/command/config.py
> ===================================================================
> --- branches/visualstudio_manifest/numpy/distutils/command/config.py
> 2008-11-17 07:00:42 UTC (rev 6055)
> +++ branches/visualstudio_manifest/numpy/distutils/command/config.py
> 2008-11-17 12:03:57 UTC (rev 6056)
> @@ -110,6 +113,21 @@
> if fileexists: continue
> log.warn('could not find library %r in directories %s' \
> % (libname, library_dirs))
> + elif self.compiler.compiler_type == 'mingw32':
> + msver = get_build_msvc_version()
> + if msver is not None:
> + if msver >= 8:
> + # check msvcr major version are the same for linking and
> + # embedding
> + msvcv = msvc_runtime_library()
> + if msvcv:
> + maj = msvcv[5:6]
> + if not maj == int(msver):
> + raise ValueError,
> + "Dyscrepancy between linked msvcr " \
> + "(%f) and the one about to be embedded " \
> + "(%f)" % (int(msver), maj)
> +
> return self._wrap_method(old_config._link,lang,
> (body, headers, include_dirs,
> libraries, library_dirs, lang))
Hi,
I don't want to be picky, but my pedantic nature has gotten the better of me :)
The section of the message in the ValueError exception reading
"Dyscrepancy between linked msvcr " should read "Discrepancy between
linked msvcr ". I think it's worth fixing if it's going to be seen by
users.
Cheers,
Scott
_______________________________________________
Numpy-discussion mailing list
Numpy-discussion@scipy.org
http://projects.scipy.org/mailman/listinfo/numpy-discussion
