ninja windows: more support for VS macros

ninja windows: more support for VS macros

Add support for VS macros $(InputPath) and $(PlatformName), and improve the locations where they can appear (rule message).

Expansion moved to happen earlier in code flow so that the special locals ($root, $source, etc.) will be included in the output when they appear as the result of a VS macro expansion.

Test case reduced from failing NaCl rule in native_client/build/common.gypi.

R=thakis@chromium.org
BUG=125606
Committed: https://code.google.com/p/gyp/source/detail?r=1347

[Nico, 2012-04-30 23:33:27]

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
File pylib/gyp/generator/ninja.py (left):

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
pylib/gyp/generator/ninja.py:1091: for a in args]
Why did this have to move up (to two places)?

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
File pylib/gyp/generator/ninja.py (right):

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
pylib/gyp/generator/ninja.py:1082: description =
self.msvs_settings.ConvertVSMacros(description)
This will crash on non-windows systems due to msvs_settings being None

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/msvs_emula...
File pylib/gyp/msvs_emulation.py (right):

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/msvs_emula...
pylib/gyp/msvs_emulation.py:156: '$(PlatformName)': 'Win32', # TODO(scottmg):
Support for x64 toolchain.
I need to do this for mac too. Maybe we should talk about this.

[scottmg, 2012-04-30 23:42:27]

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
File pylib/gyp/generator/ninja.py (left):

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
pylib/gyp/generator/ninja.py:1091: for a in args]
On 2012/04/30 23:33:27, Nico wrote:
> Why did this have to move up (to two places)?

It has to happen outside for WriteRules (the note about $source, $root in the CL
description).

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
File pylib/gyp/generator/ninja.py (right):

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/generator/...
pylib/gyp/generator/ninja.py:1082: description =
self.msvs_settings.ConvertVSMacros(description)
On 2012/04/30 23:33:27, Nico wrote:
> This will crash on non-windows systems due to msvs_settings being None

Oops, thanks. Done.

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/msvs_emula...
File pylib/gyp/msvs_emulation.py (right):

http://chromiumcodereview.appspot.com/10274018/diff/2001/pylib/gyp/msvs_emula...
pylib/gyp/msvs_emulation.py:156: '$(PlatformName)': 'Win32', # TODO(scottmg):
Support for x64 toolchain.
On 2012/04/30 23:33:27, Nico wrote:
> I need to do this for mac too. Maybe we should talk about this.

Sure, I think it's a long way off before Chromium will be able to ship x64
Windows, but maybe we'll want to at least have it available soon.

[Nico, 2012-05-01 00:11:29]

lgtm

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

http://chromiumcodereview.appspot.com/10274018/diff/6001/pylib/gyp/generator/...
pylib/gyp/generator/ninja.py:545: for argument in args:
Ah, so that it's converted here. Got it.