From: Greg Ward Date: Sun, 12 Dec 1999 17:01:01 +0000 (+0000) Subject: Changed 'build_extensions()' so 'sources' can be a list or tuple; and X-Git-Tag: v1.6a1~662 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48697d931bb86ddd114a42ccb89adb6374aef4ff;p=python Changed 'build_extensions()' so 'sources' can be a list or tuple; and call CCompiler method 'compile()' with 'include_dirs' not 'includes'. Fixed stupid typo in 'get_source_files()'. --- diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index f284092b3e..d38cb18b5c 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -179,7 +179,7 @@ class BuildExt (Command): filenames = [] # Wouldn't it be neat if we knew the names of header files too... - for (extension_name, build_info) in extensions: + for (extension_name, build_info) in self.extensions: sources = build_info.get ('sources') if type (sources) in (ListType, TupleType): filenames.extend (sources) @@ -191,10 +191,11 @@ class BuildExt (Command): for (extension_name, build_info) in extensions: sources = build_info.get ('sources') - if sources is None or type (sources) is not ListType: + if sources is None or type (sources) not in (ListType, TupleType): raise DistutilsValueError, \ "in ext_modules option, 'sources' must be present " + \ "and must be a list of source filenames" + sources = list (sources) # First step: compile the source code to object files. This # drops the object files in the current directory, regardless @@ -205,7 +206,7 @@ class BuildExt (Command): include_dirs = build_info.get ('include_dirs') self.compiler.compile (sources, macros=macros, - includes=include_dirs) + include_dirs=include_dirs) # Now link the object files together into a "shared object" -- # of course, first we have to figure out all the other things