Fix None target type with Ninja build.

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 465 matching lines @@
     elif self.flavor == 'mac' and len(self.archs) > 1:
       link_deps = collections.defaultdict(list)
 
 
     if self.flavor == 'win' and self.target.type == 'static_library':
       self.target.component_objs = link_deps
 
     # Write out a link step, if needed.
     output = None
     is_empty_bundle = not link_deps and not mac_bundle_depends
-    if link_deps or self.target.actions_stamp or actions_depends:
+    if spec['type'] == 'none':
+      abs_sources = [self.GypPathToNinja(p) for p in sources]
+      self.ninja.build(spec['target_name'], 'phony', abs_sources)
+    elif link_deps or self.target.actions_stamp or actions_depends:
       output = self.WriteTarget(spec, config_name, config, link_deps,
                                 self.target.actions_stamp or actions_depends)
       if self.is_mac_bundle:
         mac_bundle_depends.append(output)
 
     # Bundle all of the above together, if needed.
     if self.is_mac_bundle:
       output = self.WriteMacBundle(spec, mac_bundle_depends, is_empty_bundle)
 
     if not output:
@@ skipping 643 matching lines @@
     ninja_file.build(output, command + command_suffix, link_deps,
                      implicit=list(implicit_deps),
                      variables=extra_bindings)
     return linked_binary
 
   def WriteTarget(self, spec, config_name, config, link_deps, compile_deps):
     extra_link_deps = any(self.target_outputs.get(dep).Linkable()
                           for dep in spec.get('dependencies', [])
                           if dep in self.target_outputs)
     if spec['type'] == 'none' or (not link_deps and not extra_link_deps):
       # TODO(evan): don't call this function for 'none' target types, as

[scottmg, 2014/03/19 19:46:56]

i think it would be better to write the phony here, does that work ok?

[etienneb, 2014/03/19 19:53:34]

Nop, because none get filtered before by
 if link_deps or self.target.actions_stamp or actions_depends:

We may change the previous condition to accept 'none' and
hoist the code into the WriteTarget. That will works too.


On 2014/03/19 19:46:56, scottmg wrote:

[scottmg, 2014/03/19 20:04:43]

ok, i'm not sure what the best way to get to WriteTarget is, but i think the
phony should be in the subninja, rather than in the toplevel ninja anyway.

[etienneb, 2014/03/19 20:21:10]

I don't get this one.
It's inside the subninja.


On 2014/03/19 20:04:43, scottmg wrote:

       # it doesn't do anything, and we fake out a 'binary' with a stamp file.
       self.target.binary = compile_deps
       self.target.type = 'none'
     elif spec['type'] == 'static_library':
       self.target.binary = self.ComputeOutput(spec)
       if (self.flavor not in ('mac', 'openbsd', 'win') and not
           self.is_standalone_static_library):
         self.ninja.build(self.target.binary, 'alink_thin', link_deps,
                          order_only=compile_deps)
       else:
@@ skipping 1025 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)