Issue 10893030: ninja windows: Fix special variables not getting emitted when expanded from VS macros

Issue 10893030: ninja windows: Fix special variables not getting emitted when expanded from VS macros (Closed)

Created:
8 years, 3 months ago by scottmg

Modified:
8 years, 3 months ago

Reviewers:
Nico

CC:
gyp-developer_googlegroups.com

Base URL:
http://gyp.googlecode.com/svn/trunk/

Visibility:
Public.

More Reviews

Description

ninja windows: Fix builtin special variables not getting emitted. If the arguments to a rule include VS macros that turn into special variables, they weren't getting emitted. WriteRules expected the args to have been expanded so that it would see {root}, etc. and know to emit those in the build rule. See also r1484. R=thakis@chromium.org Committed: https://code.google.com/p/gyp/source/detail?r=1488

Patch Set 1 #

Total comments: 1

Patch Set 2 : #

Total comments: 4

Patch Set 3 : #

Patch Set 4 : copyright #

Created: 8 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+73 lines, -7 lines)			Patch
M	pylib/gyp/generator/ninja.py	View	1 2	5 chunks	+7 lines, -7 lines	0 comments	Download
A	test/rules/gyptest-special-variables.py	View	1	1 chunk	+18 lines, -0 lines	0 comments	Download
A	test/rules/src/an_asm.S	View	1 2 3	1 chunk	+6 lines, -0 lines	0 comments	Download
A	test/rules/src/as.bat	View	1 2 3	1 chunk	+7 lines, -0 lines	0 comments	Download
A	test/rules/src/special-variables.gyp	View	1	1 chunk	+35 lines, -0 lines	0 comments	Download

Messages

Total messages: 5 (0 generated)

Expand Messages | Collapse Messages

scottmg

working on a test now https://chromiumcodereview.appspot.com/10893030/diff/1/pylib/gyp/generator/ninja.py File pylib/gyp/generator/ninja.py (left): https://chromiumcodereview.appspot.com/10893030/diff/1/pylib/gyp/generator/ninja.py#oldcode1171 pylib/gyp/generator/ninja.py:1171: args = args[:] (assuming ...

8 years, 3 months ago (2012-08-29 16:35:35 UTC) #1

Nico

Sorry about breaking this. Probably best to revert the gyp roll until you have tests ...

8 years, 3 months ago (2012-08-29 16:49:52 UTC) #2

scottmg

Now avec new test. (test/assembly wouldn't have quite caught it were it to work on ...

8 years, 3 months ago (2012-08-29 17:10:38 UTC) #3

Nico

Bien, bien. LGTM. https://chromiumcodereview.appspot.com/10893030/diff/6001/pylib/gyp/generator/ninja.py File pylib/gyp/generator/ninja.py (right): https://chromiumcodereview.appspot.com/10893030/diff/6001/pylib/gyp/generator/ninja.py#newcode553 pylib/gyp/generator/ninja.py:553: is_cygwin, env=env) INDENT https://chromiumcodereview.appspot.com/10893030/diff/6001/pylib/gyp/generator/ninja.py#newcode1149 pylib/gyp/generator/ninja.py:1149: Returns ...

8 years, 3 months ago (2012-08-29 17:14:22 UTC) #4

scottmg

8 years, 3 months ago (2012-08-29 17:20:19 UTC) #5

https://chromiumcodereview.appspot.com/10893030/diff/6001/pylib/gyp/generator...
File pylib/gyp/generator/ninja.py (right):

https://chromiumcodereview.appspot.com/10893030/diff/6001/pylib/gyp/generator...
pylib/gyp/generator/ninja.py:553: is_cygwin, env=env)
On 2012/08/29 17:14:22, Nico wrote:
> INDENT

Done.

https://chromiumcodereview.appspot.com/10893030/diff/6001/pylib/gyp/generator...
pylib/gyp/generator/ninja.py:1149: Returns the name of the new rule."""
On 2012/08/29 17:14:22, Nico wrote:
> Update comment

Done.

Expand Messages | Collapse Messages