Fix missing variable MSVS expansion of copies arguments with Ninja.

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 565 matching lines @@
     if self.toolset != 'target':
       verb += '(%s)' % self.toolset
     if message:
       return '%s %s' % (verb, self.ExpandSpecial(message))
     else:
       return '%s %s: %s' % (verb, self.name, fallback)
 
   def WriteActions(self, actions, extra_sources, prebuild,
                    extra_mac_bundle_resources):
     # Actions cd into the base directory.
-    env = self.GetSortedXcodeEnv()
-    if self.flavor == 'win':
-      env = self.msvs_settings.GetVSMacroEnv(
-          '$!PRODUCT_DIR', config=self.config_name)
+    env = self.GetSortedToolchainEnv()
     all_outputs = []
     for action in actions:
       # First write out a rule for the action.
       name = '%s_%s' % (action['action_name'],
                         hashlib.md5(self.qualified_target).hexdigest())
       description = self.GenerateDescription('ACTION',
                                              action.get('message', None),
                                              name)
       is_cygwin = (self.msvs_settings.IsRuleRunUnderCygwin(action)
                    if self.flavor == 'win' else False)
@@ skipping 12 matching lines @@
       self.ninja.build(outputs, rule_name, inputs,
                        order_only=prebuild)
       all_outputs += outputs
 
       self.ninja.newline()
 
     return all_outputs
 
   def WriteRules(self, rules, extra_sources, prebuild,
                  mac_bundle_resources, extra_mac_bundle_resources):
-    env = self.GetSortedXcodeEnv()
+    env = self.GetSortedToolchainEnv()
     all_outputs = []
     for rule in rules:
       # First write out a rule for the rule action.
       name = '%s_%s' % (rule['rule_name'],
                         hashlib.md5(self.qualified_target).hexdigest())
       # Skip a rule with no action and no inputs.
       if 'action' not in rule and not rule.get('rule_sources', []):
         continue
       args = rule['action']
       description = self.GenerateDescription(
@@ skipping 81 matching lines @@
                          implicit=inputs,
                          order_only=prebuild,
                          variables=extra_bindings)
 
         all_outputs.extend(outputs)
 
     return all_outputs
 
   def WriteCopies(self, copies, prebuild, mac_bundle_depends):
     outputs = []
-    env = self.GetSortedXcodeEnv()
+    env = self.GetSortedToolchainEnv()
     for copy in copies:
       for path in copy['files']:
         # Normalize the path so trailing slashes don't confuse us.
         path = os.path.normpath(path)
         basename = os.path.split(path)[1]
         src = self.GypPathToNinja(path, env)
         dst = self.GypPathToNinja(os.path.join(copy['destination'], basename),
                                   env)
         outputs += self.ninja.build(dst, 'copy', src, order_only=prebuild)
         if self.is_mac_bundle:
@@ skipping 111 matching lines @@
     defines = config.get('defines', []) + extra_defines
     self.WriteVariableList(ninja_file, 'defines',
                            [Define(d, self.flavor) for d in defines])
     if self.flavor == 'win':
       self.WriteVariableList(ninja_file, 'rcflags',
           [QuoteShellArgument(self.ExpandSpecial(f), self.flavor)
            for f in self.msvs_settings.GetRcflags(config_name,
                                                   self.GypPathToNinja)])
 
     include_dirs = config.get('include_dirs', [])
     env = self.GetSortedXcodeEnv()

[scottmg, 2014/03/12 18:19:17]

collapse this one too?

[etienneb, 2014/03/12 20:07:53]

Done.

     if self.flavor == 'win':
-      env = self.msvs_settings.GetVSMacroEnv('$!PRODUCT_DIR',
-                                             config=config_name)
+      env = self.GetSortedToolchainEnv()
       include_dirs = self.msvs_settings.AdjustIncludeDirs(include_dirs,
                                                           config_name)
     self.WriteVariableList(ninja_file, 'includes',
         [QuoteShellArgument('-I' + self.GypPathToNinja(i, env), self.flavor)
          for i in include_dirs])
 
     pch_commands = precompiled_header.GetPchBuildCommands(arch)
     if self.flavor == 'mac':
       # Most targets use no precompiled headers, so only write these if needed.
       for ext, var in [('c', 'cflags_pch_c'), ('cc', 'cflags_pch_cc'),
@@ skipping 322 matching lines @@
     if package_framework and not is_empty:
       variables.append(('version', self.xcode_settings.GetFrameworkVersion()))
       self.ninja.build(output, 'package_framework', mac_bundle_depends,
                        variables=variables)
     else:
       self.ninja.build(output, 'stamp', mac_bundle_depends,
                        variables=variables)
     self.target.bundle = output
     return output
 
+  def GetSortedToolchainEnv(self, additional_settings=None):
+    """Returns the variables toolchain would set for build steps."""
+    if self.flavor == 'win':
+      return self.GetSortedMsvsEnv(additional_settings=additional_settings)
+    if self.flavor == 'mac':
+      return self.GetSortedXcodeEnv(additional_settings=additional_settings)
+    assert false, "Invalid architecture."

[scottmg, 2014/03/12 18:19:17]

I feel like this will probably be called for Linux and is expected to return
None. Or maybe GetSortedXcodeEnv returns an empty object or something? Hmm.

[etienneb, 2014/03/12 20:07:53]

I changed it to have the same semantic as before.

On 2014/03/12 18:19:17, scottmg wrote:

+
+  def GetSortedMsvsEnv(self, additional_settings=None):

[scottmg, 2014/03/12 18:19:17]

The environment returned here isn't sorted, so I don't love these names.

Could you make "GetSortedToolchainEnv" just "GetToolchainEnv"?

[etienneb, 2014/03/12 20:07:53]

Done.

+    """Returns the variables Visual Studio would set for build steps."""
+    return self.msvs_settings.GetVSMacroEnv('$!PRODUCT_DIR',
+                                             config=self.config_name)
+
   def GetSortedXcodeEnv(self, additional_settings=None):
     """Returns the variables Xcode would set for build steps."""
     assert self.abs_build_dir
     abs_build_dir = self.abs_build_dir
     return gyp.xcode_emulation.GetSortedXcodeEnv(
         self.xcode_settings, abs_build_dir,
         os.path.join(abs_build_dir, self.build_to_base), self.config_name,
         additional_settings)
 
   def GetSortedXcodePostbuildEnv(self):
@@ skipping 939 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)