Catch up with terminology change in UnixCCompiler: 'includes' -> 'include_dirs'.

diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
index 486f03ad043e3a835c0c12d6ef9427e965f1f198..8c2ddf7658cef207760b032221e1b670e3fd3525 100644 (file)
--- a/Lib/distutils/ccompiler.py
+++ b/Lib/distutils/ccompiler.py
@@ -262,7 +262,7 @@ class CCompiler:
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None,
+                 include_dirs=None,
                  extra_preargs=None,
                  extra_postargs=None):
         """Compile one or more C/C++ source files.  'sources' must be
@@ -277,7 +277,7 @@ class CCompiler:
            undefines a macro.  Later definitions/redefinitions/
            undefinitions take precedence.
 
-           'includes', if given, must be a list of strings, the directories
+           'include_dirs', if given, must be a list of strings, the directories
            to add to the default include file search path for this
            compilation only.
 
@@ -489,12 +489,12 @@ def new_compiler (plat=None,
     return klass (verbose, dry_run, force)
 
 
-def gen_preprocess_options (macros, includes):
+def gen_preprocess_options (macros, include_dirs):
     """Generate C pre-processor options (-D, -U, -I) as used by at
        least two types of compilers: the typical Unix compiler and Visual
        C++.  'macros' is the usual thing, a list of 1- or 2-tuples, where
        (name,) means undefine (-U) macro 'name', and (name,value) means
-       define (-D) macro 'name' to 'value'.  'includes' is just a list of
+       define (-D) macro 'name' to 'value'.  'include_dirs' is just a list of
        directory names to be added to the header file search path (-I).
        Returns a list of command-line options suitable for either
        Unix compilers or Visual C++."""
@@ -506,7 +506,7 @@ def gen_preprocess_options (macros, includes):
     # line).  I don't think it's essential, though, since most (all?)
     # Unix C compilers only pay attention to the latest -D or -U
     # mention of a macro on their command line.  Similar situation for
-    # 'includes'.  I'm punting on both for now.  Anyways, weeding out
+    # 'include_dirs'.  I'm punting on both for now.  Anyways, weeding out
     # redundancies like this should probably be the province of
     # CCompiler, since the data structures used are inherited from it
     # and therefore common to all CCompiler classes.
@@ -532,7 +532,7 @@ def gen_preprocess_options (macros, includes):
                 # shell at all costs when we spawn the command!
                 pp_opts.append ("-D%s=%s" % macro)
 
-    for dir in includes:
+    for dir in include_dirs:
         pp_opts.append ("-I%s" % dir)
 
     return pp_opts

diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py
index 5ac60b2e471457b3f6ae0f6f08202fabbb216ec0..d93c74c76d9d1d3f4d19274ccea5476f6cdeaa0c 100644 (file)
--- a/Lib/distutils/msvccompiler.py
+++ b/Lib/distutils/msvccompiler.py
@@ -63,19 +63,20 @@ class MSVCCompiler (CCompiler) :
                  sources,
                  output_dir=None,
                  macros=None,
-                 includes=None,
+                 include_dirs=None,
                  extra_preargs=None,
                  extra_postargs=None):
 
         if macros is None:
             macros = []
-        if includes is None:
-            includes = []
+        if include_dirs is None:
+            include_dirs = []
 
         objectFiles = []
 
-        base_pp_opts = gen_preprocess_options (self.macros + macros,
-                                               self.include_dirs + includes)
+        base_pp_opts = \
+            gen_preprocess_options (self.macros + macros,
+                                    self.include_dirs + include_dirs)
 
         base_pp_opts.append('/c')