Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Issue 10312002: Merge latest ninja_syntax.py from upstream. (Closed)

Created:
8 years, 7 months ago by Nico
Modified:
8 years, 7 months ago
Reviewers:
scottmg
CC:
gyp-developer_googlegroups.com
Visibility:
Public.

Description

Merge latest ninja_syntax.py from upstream. Changes: * ninja_syntax.py: Fix a bug when passing dict variables to Writer.build() * Explicitly turn input/output lists into list objects, for Python 3 compat * add rspfile and rspfile_content to ninja_syntax * Fix layout width in ninja_syntax.py. With this, the downstream diff reduces to: --- ../ninja/misc/ninja_syntax.py 2012-05-01 21:17:37.000000000 -0700 +++ pylib/gyp/ninja_syntax.py 2012-05-01 21:59:13.000000000 -0700 @@ -33,13 +35,16 @@ self._line('%s = %s' % (key, value), indent) def rule(self, name, command, description=None, depfile=None, - generator=False, restat=False, rspfile=None, rspfile_content=None): + generator=False, restat=False, deplist=None, rspfile=None, + rspfile_content=None): self._line('rule %s' % name) self.variable('command', command, indent=1) if description: self.variable('description', description, indent=1) if depfile: self.variable('depfile', depfile, indent=1) + if deplist: + self.variable('deplist', deplist, indent=1) if generator: self.variable('generator', '1', indent=1) if restat: Committed: https://code.google.com/p/gyp/source/detail?r=1350

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+9 lines, -4 lines) Patch
M pylib/gyp/ninja_syntax.py View 1 3 chunks +9 lines, -4 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Nico
8 years, 7 months ago (2012-05-02 05:01:28 UTC) #1
scottmg
8 years, 7 months ago (2012-05-02 05:08:37 UTC) #2
lgtm

Powered by Google App Engine
This is Rietveld 408576698