ninja/win: Put common msvs_system_include_dirs into %INCLUDE%

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import hashlib
 import json
 import multiprocessing
 import os.path
@@ skipping 1759 matching lines @@
       wrappers[key[:-len('_wrapper')]] = os.path.join(build_to_root, value)
 
   # Support wrappers from environment variables too.
   for key, value in os.environ.iteritems():
     if key.lower().endswith('_wrapper'):
       key_prefix = key[:-len('_wrapper')]
       key_prefix = re.sub(r'\.HOST$', '.host', key_prefix)
       wrappers[key_prefix] = os.path.join(build_to_root, value)
 
   if flavor == 'win':
+    # Extract msvs_system_include_dirs that are common to all targets.
+    all_system_includes = set(
+        target_dicts[target_list[0]]['configurations'][config_name].get(
+            'msvs_system_include_dirs', []))
+    for qualified_target in target_list:

[scottmg, 2014/07/19 18:49:36]

is this target_list everything? how does it relate to all_targets at 2123?

[Nico, 2014/07/19 23:05:35]

as far as I understand, all_targets gets everything referenced from the input
gyp file (usually build/all.gyp), while this is everything. (Say all.gyp depends
on foo.gyp:bar, but foo.gyp has also a target baz that nothing depends on. Then
all_targets won't have baz, but this list will.)

+      config = target_dicts[qualified_target]['configurations'][config_name]
+      system_includes = config.get('msvs_system_include_dirs', [])
+      all_system_includes = all_system_includes & set(system_includes)
+    #print 'env:', all_system_includes
+    if all_system_includes:
+      for qualified_target in target_list:
+        config = target_dicts[qualified_target]['configurations'][config_name]
+        includes = config.get('msvs_system_include_dirs', [])
+        if includes:
+          new_includes = [i for i in includes if i not in all_system_includes]
+          config['msvs_system_include_dirs'] = new_includes
+    # FIXME: Need to expand ms macros in all_system_includes too
+
     cl_paths = gyp.msvs_emulation.GenerateEnvironmentFiles(
-        toplevel_build, generator_flags, OpenOutput)
+        toplevel_build, generator_flags, all_system_includes, OpenOutput)
     for arch, path in cl_paths.iteritems():
       if clang_cl:
         # If we have selected clang-cl, use that instead.
         path = clang_cl
       command = CommandWithWrapper('CC', wrappers,
           QuoteShellArgument(path, 'win'))
       if clang_cl:
         # Use clang-cl to cross-compile for x86 or x86_64.
         command += (' -m32' if arch == 'x86' else ' -m64')
       master_ninja.variable('cl_' + arch, command)
@@ skipping 428 matching lines @@
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
         pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)