update gyp patch

1 files changed, 155 insertions, 114 deletions

diff --git a/misc/gyp.patch b/misc/gyp.patch
index c168174..25de3ff 100644
--- a/misc/gyp.patch
+++ b/misc/gyp.patch
@@ -1,8 +1,16 @@
-Index: pylib/gyp/generator/ninja.py
-===================================================================
---- pylib/gyp/generator/ninja.py	(revision 0)
-+++ pylib/gyp/generator/ninja.py	(revision 0)
-@@ -0,0 +1,505 @@
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..0d20b64
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1 @@
++*.pyc
+diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
+new file mode 100644
+index 0000000..7782d16
+--- /dev/null
++++ b/pylib/gyp/generator/ninja.py
+@@ -0,0 +1,538 @@
 +#!/usr/bin/python
 +
 +# Copyright (c) 2010 Google Inc. All rights reserved.
@@ -28,18 +36,19 @@ Index: pylib/gyp/generator/ninja.py
 +  'PRODUCT_DIR': '$b/',
 +  'SHARED_LIB_DIR': '$b/lib',
 +  'LIB_DIR': '$b/',
++
++  # Special variables that may be used by gyp 'rule' targets.
++  # We generate definitions for these variables on the fly when processing a
++  # rule.
 +  'RULE_INPUT_ROOT': '$root',
 +  'RULE_INPUT_PATH': '$source',
 +  'RULE_INPUT_EXT': '$ext',
 +  'RULE_INPUT_NAME': '$name',
-+
-+  # This appears unused --- ?
-+  'CONFIGURATION_NAME': '$(BUILDTYPE)',
 +}
 +
 +NINJA_BASE = """\
 +# Build directory.
-+b = ROOT_HACK/ninja
++b = ninja
 +
 +cc = ccache gcc
 +cxx = ccache g++
@@ -58,7 +67,7 @@ Index: pylib/gyp/generator/ninja.py
 +
 +rule alink
 +  description = AR $out
-+  command = rm -f $out && ar rcs $out $in
++  command = rm -f $out && ar rcsT $out $in
 +
 +rule solink
 +  description = SOLINK $out
@@ -151,7 +160,14 @@ Index: pylib/gyp/generator/ninja.py
 +    if sources:
 +      link_deps = self.WriteSources(config, sources, sources_predepends)
 +
-+    return self.WriteTarget(spec, config, link_deps or sources_predepends)
++    # The final output of our target depends on the last output of the
++    # above steps.
++    final_deps = link_deps or sources_predepends
++    if self.prebuild_stamp and not final_deps:
++      final_deps = [self.prebuild_stamp]
++    if not final_deps:
++      print 'warning:', self.name, 'missing output dependencies'
++    return self.WriteTarget(spec, config, final_deps)
 +
 +  def WriteActions(self, actions, extra_sources):
 +    all_outputs = []
@@ -161,13 +177,22 @@ Index: pylib/gyp/generator/ninja.py
 +      # the rule namespace is global, but it really should be scoped to the
 +      # subninja.
 +      name = self.name + '.' + action['action_name'].replace(' ', '_')
-+      command = gyp.common.EncodePOSIXShellList(action['action'])
++      args = action['action']
++      command = ''
 +      if self.base_dir:
-+        command = 'cd %s; %s' % (self.base_dir, command)
-+      if 'description' in action:
-+        description = action['message']
++        # The command expects to be run from the current directory.
++        # cd into the directory before running, and adjust all the
++        # paths to point to the proper locations.
++        command = 'cd %s; ' % self.base_dir
++        cdup = '../' * len(self.base_dir.split('/'))
++        args = [arg.replace('$b', cdup + '$b') for arg in args]
++
++      command += gyp.common.EncodePOSIXShellList(args)
++
++      if 'message' in action:
++        description = 'ACTION ' + action['message']
 +      else:
-+        description = '%s: %s' % (self.name, action['action_name'])
++        description = 'ACTION %s: %s' % (self.name, action['action_name'])
 +      self.WriteRule(name=name, command=command, description=description)
 +
 +      inputs = [self.InputPath(i) for i in action['inputs']]
@@ -201,12 +226,25 @@ Index: pylib/gyp/generator/ninja.py
 +      # subninja.
 +      self.WriteLn('# rule: ' + repr(rule))
 +      name = self.name + '.' + rule['rule_name'].replace(' ', '_')
-+      action = rule['action']
-+      command = gyp.common.EncodePOSIXShellList(action)
++      args = rule['action']
++      command = ''
 +      if self.base_dir:
-+        command = 'cd %s; %s' % (self.base_dir, command)
-+      # XXX do rules have a short name?
-+      description = '%s: %s' % (self.name, rule['rule_name'])
++        # The command expects to be run from the current directory.
++        # cd into the directory before running, and adjust all the
++        # paths to point to the proper locations.
++        command = 'cd %s; ' % self.base_dir
++        cdup = '../' * len(self.base_dir.split('/'))
++        args = args[:]
++        for i, arg in enumerate(args):
++          args[i] = args[i].replace('$b', cdup + '$b')
++          args[i] = args[i].replace('$source', cdup + '$source')
++
++      command += gyp.common.EncodePOSIXShellList(args)
++
++      if 'message' in rule:
++        description = 'RULE ' + rule['message']
++      else:
++        description = 'RULE %s: %s $source' % (self.name, rule['rule_name'])
 +      self.WriteRule(name=name, command=command, description=description)
 +      self.WriteLn()
 +
@@ -216,8 +254,8 @@ Index: pylib/gyp/generator/ninja.py
 +      # Compute which edge-scoped variables all build rules will need
 +      # to provide.
 +      special_locals = ('source', 'root', 'ext', 'name')
-+      needed_variables = set()
-+      for argument in action:
++      needed_variables = set(['source'])
++      for argument in args:
 +        for var in special_locals:
 +          if '$' + var in argument:
 +            needed_variables.add(var)
@@ -236,13 +274,13 @@ Index: pylib/gyp/generator/ninja.py
 +          if var == 'root':
 +            extra_bindings.append(('root', root))
 +          elif var == 'source':
-+            extra_bindings.append(('source', source))
++            extra_bindings.append(('source', self.InputPath(source)))
 +          elif var == 'ext':
 +            extra_bindings.append(('ext', ext))
 +          elif var == 'name':
 +            extra_bindings.append(('name', basename))
 +          else:
-+            assert var == None, var
++            assert var == None, repr(var)
 +        # XXX need to add extra dependencies on rule inputs
 +        # (e.g. if generator program changes, we need to rerun)
 +        self.WriteEdge(outputs, name, [self.InputPath(source)],
@@ -305,7 +343,7 @@ Index: pylib/gyp/generator/ninja.py
 +    self.WriteLn()
 +    return outputs
 +
-+  def WriteTarget(self, spec, config, link_deps):
++  def WriteTarget(self, spec, config, final_deps):
 +    # XXX only write these for rules that will use them
 +    self.WriteVariableList('ldflags', config.get('ldflags'))
 +    self.WriteVariableList('libs', spec.get('libraries'))
@@ -317,7 +355,7 @@ Index: pylib/gyp/generator/ninja.py
 +      extra_deps = set()
 +      for dep in deps:
 +        extra_deps.update(self.target_links.get(dep, set()))
-+      link_deps.extend(list(extra_deps))
++      final_deps.extend(list(extra_deps))
 +    command_map = {
 +      'executable':      'link',
 +      'static_library':  'alink',
@@ -329,7 +367,7 @@ Index: pylib/gyp/generator/ninja.py
 +    extra_bindings = []
 +    if command == 'solink':
 +      extra_bindings.append(('soname', os.path.split(output)[1]))
-+    self.WriteEdge([output], command, link_deps,
++    self.WriteEdge([output], command, final_deps,
 +                   extra_bindings=extra_bindings,
 +                   use_prebuild_stamp=False)
 +
@@ -404,7 +442,7 @@ Index: pylib/gyp/generator/ninja.py
 +    if use_prebuild_stamp and self.prebuild_stamp:
 +      extra_inputs.append(self.prebuild_stamp)
 +    if extra_inputs:
-+      extra_inputs = ['|'] + extra_inputs
++      extra_inputs = ['||'] + extra_inputs
 +    self.WriteList('build ' + ' '.join(outputs) + ': ' + command,
 +                   inputs + extra_inputs)
 +    if extra_bindings:
@@ -460,7 +498,6 @@ Index: pylib/gyp/generator/ninja.py
 +  builddir_name = generator_flags.get('output_dir', 'ninja')
 +
 +  src_root = options.depth
-+  config_name = 'Default'
 +  master_ninja = open(os.path.join(src_root, 'build.ninja'), 'w')
 +  master_ninja.write(NINJA_BASE)
 +
@@ -483,8 +520,12 @@ Index: pylib/gyp/generator/ninja.py
 +    ninja_path = os.path.join(base_path, target + '.ninja')
 +    output_file = os.path.join(src_root, ninja_path)
 +    spec = target_dicts[qualified_target]
-+    if config_name not in spec['configurations']:
-+      config_name = spec['default_configuration']
++    if 'config' in generator_flags:
++      config_name = generator_flags['config']
++    else:
++      config_name = 'Default'
++      if config_name not in spec['configurations']:
++        config_name = spec['default_configuration']
 +    config = spec['configurations'][config_name]
 +
 +    writer = NinjaWriter(target_outputs, target_links, base_path, output_file)
@@ -504,15 +545,70 @@ Index: pylib/gyp/generator/ninja.py
 +    print >>master_ninja, 'subninja', ninja
 +
 +  if all_outputs:
-+    print >>master_ninja, 'build all: phony |' + ' '.join(all_outputs)
++    print >>master_ninja, 'build all: phony ||' + ' '.join(all_outputs)
 +
 +  master_ninja.close()
 +  OverPrint('done.\n')
-Index: test/additional-targets/gyptest-additional.py
-===================================================================
---- test/additional-targets/gyptest-additional.py	(revision 877)
-+++ test/additional-targets/gyptest-additional.py	(working copy)
-@@ -33,7 +33,7 @@
+diff --git a/test/actions/gyptest-all.py b/test/actions/gyptest-all.py
+index 8db38d5..d5426e6 100644
+--- a/test/actions/gyptest-all.py
++++ b/test/actions/gyptest-all.py
+@@ -20,12 +20,16 @@ test.relocate('src', 'relocate/src')
+ 
+ # Test that an "always run" action increases a counter on multiple invocations,
+ # and that a dependent action updates in step.
++# XXX in ninja's case, the dependent action has a gyp dependency on the previous
++# action, which translates into an order-only dep.  But since there is no file
++# that is actually an input to the dependent rule, we never run the dependent
++# rule.
+ test.build('actions.gyp', test.ALL, chdir='relocate/src')
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1')
+-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1')
++#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1')
+ test.build('actions.gyp', test.ALL, chdir='relocate/src')
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
+-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
++#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
+ 
+ # The "always run" action only counts to 2, but the dependent target will count
+ # forever if it's allowed to run. This verifies that the dependent target only
+@@ -33,7 +37,8 @@ test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
+ # "always run" ran.
+ test.build('actions.gyp', test.ALL, chdir='relocate/src')
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
+-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
++# XXX this always run stuff is crazy -- temporarily removing.
++# test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
+ 
+ expect = """\
+ Hello from program.c
+diff --git a/test/actions/gyptest-default.py b/test/actions/gyptest-default.py
+index c877867..450faef 100644
+--- a/test/actions/gyptest-default.py
++++ b/test/actions/gyptest-default.py
+@@ -23,7 +23,7 @@ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1')
+ test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1')
+ test.build('actions.gyp', chdir='relocate/src')
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
+-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
++#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
+ 
+ # The "always run" action only counts to 2, but the dependent target will count
+ # forever if it's allowed to run. This verifies that the dependent target only
+@@ -31,7 +31,7 @@ test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
+ # "always run" ran.
+ test.build('actions.gyp', test.ALL, chdir='relocate/src')
+ test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
+-test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
++#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
+ 
+ expect = """\
+ Hello from program.c
+diff --git a/test/additional-targets/gyptest-additional.py b/test/additional-targets/gyptest-additional.py
+index 02e7d7a..af35b33 100644
+--- a/test/additional-targets/gyptest-additional.py
++++ b/test/additional-targets/gyptest-additional.py
+@@ -33,7 +33,7 @@ test.built_file_must_not_exist('foolib1',
                                 chdir=chdir)
  
  # TODO(mmoss) Make consistent with scons, with 'dir1' before 'out/Default'?
@@ -521,11 +617,11 @@ Index: test/additional-targets/gyptest-additional.py
    chdir='relocate/src'
  else:
    chdir='relocate/src/dir1'
-Index: test/assembly/gyptest-assembly.py
-===================================================================
---- test/assembly/gyptest-assembly.py	(revision 877)
-+++ test/assembly/gyptest-assembly.py	(working copy)
-@@ -13,7 +13,7 @@
+diff --git a/test/assembly/gyptest-assembly.py b/test/assembly/gyptest-assembly.py
+index 40d0a06..09d612b 100644
+--- a/test/assembly/gyptest-assembly.py
++++ b/test/assembly/gyptest-assembly.py
+@@ -13,7 +13,7 @@ import sys
  import TestGyp
  
  # TODO(bradnelson): get this working for windows.
@@ -534,11 +630,11 @@ Index: test/assembly/gyptest-assembly.py
  
  test.run_gyp('assembly.gyp', chdir='src')
  
-Index: test/builddir/gyptest-default.py
-===================================================================
---- test/builddir/gyptest-default.py	(revision 877)
-+++ test/builddir/gyptest-default.py	(working copy)
-@@ -23,7 +23,7 @@
+diff --git a/test/builddir/gyptest-all.py b/test/builddir/gyptest-all.py
+index 324d7fc..885d680 100644
+--- a/test/builddir/gyptest-all.py
++++ b/test/builddir/gyptest-all.py
+@@ -23,7 +23,7 @@ import TestGyp
  # its sources. I'm not sure if make is wrong for writing outside the current
  # directory, or if the test is wrong for assuming everything generated is under
  # the current directory.
@@ -547,11 +643,11 @@ Index: test/builddir/gyptest-default.py
  
  test.run_gyp('prog1.gyp', '--depth=..', chdir='src')
  
-Index: test/builddir/gyptest-all.py
-===================================================================
---- test/builddir/gyptest-all.py	(revision 877)
-+++ test/builddir/gyptest-all.py	(working copy)
-@@ -23,7 +23,7 @@
+diff --git a/test/builddir/gyptest-default.py b/test/builddir/gyptest-default.py
+index 6171d15..8c63026 100644
+--- a/test/builddir/gyptest-default.py
++++ b/test/builddir/gyptest-default.py
+@@ -23,7 +23,7 @@ import TestGyp
  # its sources. I'm not sure if make is wrong for writing outside the current
  # directory, or if the test is wrong for assuming everything generated is under
  # the current directory.
@@ -560,11 +656,11 @@ Index: test/builddir/gyptest-all.py
  
  test.run_gyp('prog1.gyp', '--depth=..', chdir='src')
  
-Index: test/lib/TestGyp.py
-===================================================================
---- test/lib/TestGyp.py	(revision 877)
-+++ test/lib/TestGyp.py	(working copy)
-@@ -391,6 +391,47 @@
+diff --git a/test/lib/TestGyp.py b/test/lib/TestGyp.py
+index fcdd12c..fb54760 100644
+--- a/test/lib/TestGyp.py
++++ b/test/lib/TestGyp.py
+@@ -391,6 +391,47 @@ class TestGypMake(TestGypBase):
      return self.workpath(*result)
  
  
@@ -612,7 +708,7 @@ Index: test/lib/TestGyp.py
  class TestGypMSVS(TestGypBase):
    """
    Subclass for testing the GYP Visual Studio generator.
-@@ -670,6 +711,7 @@
+@@ -670,6 +711,7 @@ format_class_list = [
    TestGypGypd,
    TestGypMake,
    TestGypMSVS,
@@ -620,58 +716,3 @@ Index: test/lib/TestGyp.py
    TestGypSCons,
    TestGypXcode,
  ]
-Index: test/actions/gyptest-default.py
-===================================================================
---- test/actions/gyptest-default.py	(revision 877)
-+++ test/actions/gyptest-default.py	(working copy)
-@@ -23,7 +23,7 @@
- test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1')
- test.build('actions.gyp', chdir='relocate/src')
- test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
--test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
-+#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
- 
- # The "always run" action only counts to 2, but the dependent target will count
- # forever if it's allowed to run. This verifies that the dependent target only
-@@ -31,7 +31,7 @@
- # "always run" ran.
- test.build('actions.gyp', test.ALL, chdir='relocate/src')
- test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
--test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
-+#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
- 
- expect = """\
- Hello from program.c
-Index: test/actions/gyptest-all.py
-===================================================================
---- test/actions/gyptest-all.py	(revision 877)
-+++ test/actions/gyptest-all.py	(working copy)
-@@ -20,12 +20,16 @@
- 
- # Test that an "always run" action increases a counter on multiple invocations,
- # and that a dependent action updates in step.
-+# XXX in ninja's case, the dependent action has a gyp dependency on the previous
-+# action, which translates into an order-only dep.  But since there is no file
-+# that is actually an input to the dependent rule, we never run the dependent
-+# rule.
- test.build('actions.gyp', test.ALL, chdir='relocate/src')
- test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1')
--test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1')
-+#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1')
- test.build('actions.gyp', test.ALL, chdir='relocate/src')
- test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
--test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
-+#test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
- 
- # The "always run" action only counts to 2, but the dependent target will count
- # forever if it's allowed to run. This verifies that the dependent target only
-@@ -33,7 +37,8 @@
- # "always run" ran.
- test.build('actions.gyp', test.ALL, chdir='relocate/src')
- test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2')
--test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
-+# XXX this always run stuff is crazy -- temporarily removing.
-+# test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2')
- 
- expect = """\
- Hello from program.c