Support command wrapper in make_global_settings

Support command wrapper in make_global_settings

If $cmd_wrapper is defined in make_global_settings, it will be
prepend to $cmd.  For example,
 'make_global_settings': [
   ['CC_wrapper', '/usr/bin/distcc'],
   ['CC', '/usr/bin/gcc'],
 ]
then
 CC ?= /usr/bin/distcc /usr/bin/gcc  # Makefile
or
 cc = /usr/bin/distcc /usr/bin/gcc   # build.ninja

LINK_wrapper is pre defined as 'flock $(builddir)/linker.lock'

BUG=chromium:173686
R=thakis@chromium.org

Committed: https://code.google.com/p/gyp/source/detail?r=1586

[Nico, 2013-02-19 17:21:30]

Looks great! A few minor questions.

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py
File pylib/gyp/generator/make.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2005: m = re.match('(.*)_wrapper', key)
if key.endswith('_wrapper'):
  wrappers[key[0:len('_wrapper')]] = ...

is a bit shorter and easier to read imho (but feel free to leave as is if you
want)

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2028: # TODO(ukai): define cmd which wrapper only is
specified in
s/which/when/
s/wrapper only/only wrapper/

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/ninja.py
File pylib/gyp/generator/ninja.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/ninja.py#...
pylib/gyp/generator/ninja.py:1317: m = re.match('(.*)_wrapper', key)
same comment as in the make generator

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/ninja.py#...
pylib/gyp/generator/ninja.py:1319: wrappers[m.group(1).lower()] =
os.path.join(build_to_root, value)
You don't use lower() in the make generator. Should this be done consistently in
both generators?

[ukai, 2013-02-20 07:22:53]

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py
File pylib/gyp/generator/make.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2005: m = re.match('(.*)_wrapper', key)
On 2013/02/19 17:21:30, Nico wrote:
> if key.endswith('_wrapper'):
>   wrappers[key[0:len('_wrapper')]] = ...

 key[0:len(key)-len('_wrapper')] ?

> 
> is a bit shorter and easier to read imho (but feel free to leave as is if you
> want)

Done

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2028: # TODO(ukai): define cmd which wrapper only is
specified in
On 2013/02/19 17:21:30, Nico wrote:
> s/which/when/
> s/wrapper only/only wrapper/

Done.

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/ninja.py
File pylib/gyp/generator/ninja.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/ninja.py#...
pylib/gyp/generator/ninja.py:1317: m = re.match('(.*)_wrapper', key)
On 2013/02/19 17:21:30, Nico wrote:
> same comment as in the make generator

Done.

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/ninja.py#...
pylib/gyp/generator/ninja.py:1319: wrappers[m.group(1).lower()] =
os.path.join(build_to_root, value)
On 2013/02/19 17:21:30, Nico wrote:
> You don't use lower() in the make generator. Should this be done consistently
in
> both generators?

Done.

[Nico, 2013-02-20 09:12:40]

lgtm

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py
File pylib/gyp/generator/make.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2005: m = re.match('(.*)_wrapper', key)
On 2013/02/20 07:22:53, ukai wrote:
> On 2013/02/19 17:21:30, Nico wrote:
> > if key.endswith('_wrapper'):
> >   wrappers[key[0:len('_wrapper')]] = ...
> 
>  key[0:len(key)-len('_wrapper')] ?

err yes :-)

> 
> > 
> > is a bit shorter and easier to read imho (but feel free to leave as is if
you
> > want)
> 
> Done

[Sam Clegg, 2013-02-20 19:55:20]

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py
File pylib/gyp/generator/make.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2005: m = re.match('(.*)_wrapper', key)
On 2013/02/20 07:22:53, ukai wrote:
> On 2013/02/19 17:21:30, Nico wrote:
> > if key.endswith('_wrapper'):
> >   wrappers[key[0:len('_wrapper')]] = ...
> 
>  key[0:len(key)-len('_wrapper')] ?
> 

I think you can just do:

key[:-len('_wrapper')]

[ukai, 2013-02-21 06:41:44]

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py
File pylib/gyp/generator/make.py (right):

https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
pylib/gyp/generator/make.py:2005: m = re.match('(.*)_wrapper', key)
On 2013/02/20 19:55:20, Sam Clegg wrote:
> On 2013/02/20 07:22:53, ukai wrote:
> > On 2013/02/19 17:21:30, Nico wrote:
> > > if key.endswith('_wrapper'):
> > >   wrappers[key[0:len('_wrapper')]] = ...
> > 
> >  key[0:len(key)-len('_wrapper')] ?
> > 
> 
> I think you can just do:
> 
> key[:-len('_wrapper')]

Done.

[Nico, 2013-02-21 09:22:08]

On 2013/02/21 06:41:44, ukai wrote:
> https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py
> File pylib/gyp/generator/make.py (right):
> 
>
https://codereview.chromium.org/12300015/diff/1/pylib/gyp/generator/make.py#n...
> pylib/gyp/generator/make.py:2005: m = re.match('(.*)_wrapper', key)
> On 2013/02/20 19:55:20, Sam Clegg wrote:
> > On 2013/02/20 07:22:53, ukai wrote:
> > > On 2013/02/19 17:21:30, Nico wrote:
> > > > if key.endswith('_wrapper'):
> > > >   wrappers[key[0:len('_wrapper')]] = ...
> > > 
> > >  key[0:len(key)-len('_wrapper')] ?
> > > 
> > 
> > I think you can just do:
> > 
> > key[:-len('_wrapper')]
> 
> Done.

Do you want me to land this? I don't remember if you're a gyp committer. (If
not, you could also ask mmentovai@google or bradnelson@google for the gyp commit
bit.)

[ukai, 2013-02-26 03:00:08]

Committed patchset #5 manually as r1586 (presubmit successful).