clang/win: Support spaces in Visual Studio directory name

clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

Also filter out empty include directories, since -msvc always combines
with what's after it.

BUG=640000
R=hans@chromium.org, scottmg@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/42bff43d05a5272b3e697e52801c266c04b59bc8

[Nico, 2016-08-23 14:46:58]

The CQ bit was checked by thakis@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-23 14:47:20]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Nico, 2016-08-23 14:48:17]

thakis@chromium.org changed reviewers:
+ scottmg@chromium.org

[Nico, 2016-08-23 14:48:18]

I don't have a system install of 2015, so I only tested that this doesn't break
the hermetic toolchain case. But it should make the non-hermetic toolchain case
go in theory...

[scottmg, 2016-08-23 15:13:21]

Ah, I was wondering why it's a clang-only problem, but makes sense that it's
only the system headers flag.

lgtm

[hans, 2016-08-23 15:16:54]

hans@chromium.org changed reviewers:
+ hans@chromium.org

[hans, 2016-08-23 15:16:54]

On 2016/08/23 14:48:18, Nico wrote:
> I don't have a system install of 2015, so I only tested that this doesn't
break
> the hermetic toolchain case. But it should make the non-hermetic toolchain
case
> go in theory...

Let me try it out locally real quick..

https://codereview.chromium.org/2276513002/diff/1/build/toolchain/win/setup_t...
File build/toolchain/win/setup_toolchain.py (right):

https://codereview.chromium.org/2276513002/diff/1/build/toolchain/win/setup_t...
build/toolchain/win/setup_toolchain.py:210: include = [include_prefix + p for p
in env['INCLUDE'].split(';')]
Should we remove empty components from the result of the split? In the bug we're
ending up with an empty -imsvc option.

[Nico, 2016-08-23 15:23:23]

Description was changed from

==========
clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

BUG=640000
==========

to

==========
clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

Also filter out empty include directories, since -msvc always combines
with what's after it.

BUG=640000
==========

[Nico, 2016-08-23 15:23:32]

https://codereview.chromium.org/2276513002/diff/1/build/toolchain/win/setup_t...
File build/toolchain/win/setup_toolchain.py (right):

https://codereview.chromium.org/2276513002/diff/1/build/toolchain/win/setup_t...
build/toolchain/win/setup_toolchain.py:210: include = [include_prefix + p for p
in env['INCLUDE'].split(';')]
On 2016/08/23 15:16:54, hans wrote:
> Should we remove empty components from the result of the split? In the bug
we're
> ending up with an empty -imsvc option.

Yes, we should (...but we really shouldn't have those in the first place :-/)

Hm, I guess we don't control that if we rely on vcvarsall. Done.

[Nico, 2016-08-23 15:23:32]

The CQ bit was checked by thakis@chromium.org to run a CQ dry run

[hans, 2016-08-23 15:23:40]

On 2016/08/23 15:16:54, hans wrote:
> On 2016/08/23 14:48:18, Nico wrote:
> > I don't have a system install of 2015, so I only tested that this doesn't
> break
> > the hermetic toolchain case. But it should make the non-hermetic toolchain
> case
> > go in theory...
> 
> Let me try it out locally real quick..

The quoting works but we still have the problem with an empty -imsvc option, now
quoted ending up in toolchain.ninja:

"-imsvc" ${defines}

And the quotes don't fix the problem there.

How about starting with something like:

includes = filter(len, env['INCLUDE'].split(';')]) ?

[commit-bot: I haz the power, 2016-08-23 15:23:51]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hans, 2016-08-23 15:27:29]

The new patch version works beautifully. lgtm

[commit-bot: I haz the power, 2016-08-23 15:35:18]

Description was changed from

==========
clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

Also filter out empty include directories, since -msvc always combines
with what's after it.

BUG=640000
==========

to

==========
clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

Also filter out empty include directories, since -msvc always combines
with what's after it.

BUG=640000
R=hans@chromium.org, scottmg@chromium.org

Committed: https://crrev.com/42bff43d05a5272b3e697e52801c266c04b59bc8
Cr-Commit-Position: refs/heads/master@{#413742}
==========

[commit-bot: I haz the power, 2016-08-23 15:35:19]

Patchset 2 (id:??) landed as
https://crrev.com/42bff43d05a5272b3e697e52801c266c04b59bc8
Cr-Commit-Position: refs/heads/master@{#413742}

[Nico, 2016-08-23 15:36:12]

Description was changed from

==========
clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

Also filter out empty include directories, since -msvc always combines
with what's after it.

BUG=640000
R=hans@chromium.org, scottmg@chromium.org

Committed: https://crrev.com/42bff43d05a5272b3e697e52801c266c04b59bc8
Cr-Commit-Position: refs/heads/master@{#413742}
==========

to

==========
clang/win: Support spaces in Visual Studio directory name

The hermetic toolchain in depot_tools usually doesn't contain spaces,
but system MSVC usually does ("Program Files").  Escape spaces once
for the shell, and use gn_helpers to escape a second time for gn,
instead of asserting that no " is in the path -- that's no longer
true since the first level of quoting adds some.

Also filter out empty include directories, since -msvc always combines
with what's after it.

BUG=640000
R=hans@chromium.org, scottmg@chromium.org

Committed:
https://chromium.googlesource.com/chromium/src/+/42bff43d05a5272b3e697e52801c...
==========

[Nico, 2016-08-23 15:36:13]

Committed patchset #2 (id:20001) manually as
42bff43d05a5272b3e697e52801c266c04b59bc8 (presubmit successful).