Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv31686
Modified Files:
build_ext.py
Log Message:
Removed the implib_dir instance variable because it is unused.
Removed get_ext_libname() because it is unused.
Fixed get_libraries() to append an '_d' to the python debug
import library. If MSVC is used, do not add 'pythonxx.lib' to
the list of libraries, because this is handled better
by a pragma in config.h.
This should fix bug #115595, but it needs some more testing.
Index: build_ext.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/build_ext.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** build_ext.py 2000/09/25 01:41:15 1.66
--- build_ext.py 2000/09/28 19:28:35 1.67
***************
*** 159,163 ****
if os.name == 'nt':
self.library_dirs.append (os.path.join(sys.exec_prefix, 'libs'))
- self.implib_dir = self.build_temp
if self.debug:
self.build_temp = os.path.join (self.build_temp, "Debug")
--- 159,162 ----
***************
*** 544,556 ****
return apply (os.path.join, ext_path) + so_ext
- def get_ext_libname (self, ext_name):
- # create a filename for the (unneeded) lib-file.
- # extensions in debug_mode are named 'module_d.pyd' under windows
- ext_path = string.split (ext_name, '.')
- if os.name == 'nt' and self.debug:
- return apply (os.path.join, ext_path) + '_d.lib'
- return apply (os.path.join, ext_path) + '.lib'
-
-
def get_export_symbols (self, ext):
"""Return the list of symbols that a shared extension has to
--- 543,546 ----
***************
*** 574,580 ****
# config.h that MSVC groks. The other Windows compilers all seem
# to need it mentioned explicitly, though, so that's what we do.
! if sys.platform == "win32":
! pythonlib = ("python%d%d" %
! (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
# don't extend ext.libraries, it may be shared with other
# extensions, it is a reference to the original list
--- 564,576 ----
# config.h that MSVC groks. The other Windows compilers all seem
# to need it mentioned explicitly, though, so that's what we do.
! # Append '_d' to the python import library on debug builds.
! from distutils.msvccompiler import MSVCCompiler
! if sys.platform == "win32" and \
! not isinstance(self.compiler, MSVCCompiler):
! template = "python%d%d"
! if self.debug:
! template = template + '_d'
! pythonlib = (template %
! (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
# don't extend ext.libraries, it may be shared with other
# extensions, it is a reference to the original list
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4