Big patch from Rene Liebscher to simplify the CCompiler API and
implementations. Details:
* replace 'link_shared_object()', 'link_shared_lib()', and
'link_executable()' with 'link()', which is (roughly)
the union of the three methods it replaces
* in all implementation classes (UnixCCompiler, MSVCCompiler, etc.),
ditch the old 'link_*()' methods and replace them with 'link()'
* in the abstract base class (CCompiler), add the old 'link_*()'
methods as wrappers around the new 'link()' (they also print
a warning of the deprecated interface)
Also increases consistency between MSVCCompiler and BCPPCompiler,
hopefully to make it easier to factor out the mythical WindowsCCompiler
class. Details:
* use 'self.linker' instead of 'self.link'
* add ability to compile resource files to BCPPCompiler
* added (redundant?) 'object_filename()' method to BCPPCompiler
* only generate a .def file if 'export_symbols' defined
diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index ce3f2be..9794906 100644
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -561,24 +561,32 @@
pass
- def link_shared_lib (self,
- objects,
- output_libname,
- output_dir=None,
- libraries=None,
- library_dirs=None,
- runtime_library_dirs=None,
- export_symbols=None,
- debug=0,
- extra_preargs=None,
- extra_postargs=None,
- build_temp=None):
- """Link a bunch of stuff together to create a shared library file.
- Similar semantics to 'create_static_lib()', with the addition of
- other libraries to link against and directories to search for them.
- Also, of course, the type and name of the generated file will
- almost certainly be different, as will the program used to create
- it.
+ # values for target_desc parameter in link()
+ SHARED_OBJECT = "shared_object"
+ SHARED_LIBRARY = "shared_library"
+ EXECUTABLE = "executable"
+
+ def link (self,
+ target_desc,
+ objects,
+ output_filename,
+ output_dir=None,
+ libraries=None,
+ library_dirs=None,
+ runtime_library_dirs=None,
+ export_symbols=None,
+ debug=0,
+ extra_preargs=None,
+ extra_postargs=None,
+ build_temp=None):
+ """Link a bunch of stuff together to create an executable or
+ shared library file.
+
+ The "bunch of stuff" consists of the list of object files supplied
+ as 'objects'. 'output_filename' should be a filename. If
+ 'output_dir' is supplied, 'output_filename' is relative to it
+ (i.e. 'output_filename' can provide directory components if
+ needed).
'libraries' is a list of libraries to link against. These are
library names, not filenames, since they're translated into
@@ -610,7 +618,31 @@
Raises LinkError on failure.
"""
- pass
+ raise NotImplementedError
+
+
+ # old methods, rewritten to use the new link() method.
+
+ def link_shared_lib (self,
+ objects,
+ output_libname,
+ output_dir=None,
+ libraries=None,
+ library_dirs=None,
+ runtime_library_dirs=None,
+ export_symbols=None,
+ debug=0,
+ extra_preargs=None,
+ extra_postargs=None,
+ build_temp=None):
+ self.warn("link_shared_lib(..) is deprecated, please "
+ "use link(CCompiler.SHARED_LIBRARY, ...) instead")
+ self.link(CCompiler.SHARED_LIBRARY, objects,
+ self.library_filename(output_libname, lib_type='shared'),
+ output_dir,
+ libraries, library_dirs, runtime_library_dirs,
+ export_symbols, debug,
+ extra_preargs, extra_postargs, build_temp)
def link_shared_object (self,
@@ -625,16 +657,13 @@
extra_preargs=None,
extra_postargs=None,
build_temp=None):
- """Link a bunch of stuff together to create a shared object file.
- Much like 'link_shared_lib()', except the output filename is
- explicitly supplied as 'output_filename'. If 'output_dir' is
- supplied, 'output_filename' is relative to it
- (i.e. 'output_filename' can provide directory components if
- needed).
-
- Raises LinkError on failure.
- """
- pass
+ self.warn("link_shared_object(...) is deprecated, please "
+ "use link(CCompiler.SHARED_OBJECT,...) instead.")
+ self.link(CCompiler.SHARED_OBJECT, objects,
+ output_filename, output_dir,
+ libraries, library_dirs, runtime_library_dirs,
+ export_symbols, debug,
+ extra_preargs, extra_postargs, build_temp)
def link_executable (self,
@@ -647,16 +676,12 @@
debug=0,
extra_preargs=None,
extra_postargs=None):
- """Link a bunch of stuff together to create a binary executable
- file. The "bunch of stuff" is as for 'link_shared_lib()'.
- 'output_progname' should be the base name of the executable
- program--e.g. on Unix the same as the output filename, but on
- DOS/Windows ".exe" will be appended.
-
- Raises LinkError on failure.
- """
- pass
-
+ self.warn("link_executable(...) is deprecated, please "
+ "use link(CCompiler.EXECUTABLE,...) instead.")
+ self.link (CCompiler.EXECUTABLE, objects,
+ self.executable_filename(output_progname), output_dir,
+ libraries, library_dirs, runtime_library_dirs, None,
+ debug, extra_preargs, extra_postargs, None)
# -- Miscellaneous methods -----------------------------------------
@@ -756,6 +781,14 @@
basename = os.path.basename (basename)
return os.path.join (output_dir, basename + self.shared_lib_extension)
+ def executable_filename (self,
+ basename,
+ strip_dir=0,
+ output_dir=''):
+ if output_dir is None: output_dir = ''
+ if strip_dir:
+ basename = os.path.basename (basename)
+ return os.path.join(output_dir, basename + (self.exe_extension or ''))
def library_filename (self,
libname,