[Numpy-svn] r6063 - in branches/visualstudio_manifest/numpy/distutils: . command
numpy-svn at scipy.org
numpy-svn at scipy.org
Mon Nov 17 07:07:52 EST 2008
Author: cdavid
Date: 2008-11-17 06:07:36 -0600 (Mon, 17 Nov 2008)
New Revision: 6063
Modified:
branches/visualstudio_manifest/numpy/distutils/command/config.py
branches/visualstudio_manifest/numpy/distutils/mingw32ccompiler.py
Log:
Fix configtest and manifest_name.
Modified: branches/visualstudio_manifest/numpy/distutils/command/config.py
===================================================================
--- branches/visualstudio_manifest/numpy/distutils/command/config.py 2008-11-17 12:06:58 UTC (rev 6062)
+++ branches/visualstudio_manifest/numpy/distutils/command/config.py 2008-11-17 12:07:36 UTC (rev 6063)
@@ -13,7 +13,7 @@
from distutils.msvccompiler import get_build_version as get_build_msvc_version
from numpy.distutils.exec_command import exec_command
from numpy.distutils.mingw32ccompiler import msvc_manifest_xml, \
- check_embedded_msvcr_match_linked, manifest_name, rc_name
+ check_embedded_msvcr_match_linked, manifest_name, rc_name, manifest_rc
LANG_EXT['f77'] = '.f'
LANG_EXT['f90'] = '.f90'
Modified: branches/visualstudio_manifest/numpy/distutils/mingw32ccompiler.py
===================================================================
--- branches/visualstudio_manifest/numpy/distutils/mingw32ccompiler.py 2008-11-17 12:06:58 UTC (rev 6062)
+++ branches/visualstudio_manifest/numpy/distutils/mingw32ccompiler.py 2008-11-17 12:07:36 UTC (rev 6063)
@@ -308,14 +308,14 @@
"(%d)" % (int(msver), maj)
def configtest_name(config):
- base = os.path.basename(config._gen_temp_sourcefile("yo", [], lang))
+ base = os.path.basename(config._gen_temp_sourcefile("yo", [], "c"))
return os.path.splitext(base)[0]
def manifest_name(config):
# Get configest name (including suffix)
root = configtest_name(config)
- exext = self.compiler.exe_extension
- return root + exect + ".manifest"
+ exext = config.compiler.exe_extension
+ return root + exext + ".manifest"
def rc_name(config):
# Get configest name (including suffix)
More information about the Numpy-svn
mailing list