Chromium Code Reviews
Help | Chromium Project | Sign in
(954)

Issue 11363143: ninja windows: Support x64 configuration platform (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
1 year, 5 months ago by scottmg
Modified:
1 year, 5 months ago
Reviewers:
bradn, Sam Clegg
CC:
gyp-developer_googlegroups.com, Justin Schuh
Visibility:
Public.

Description

ninja windows: Support x64 configuration platform

This supports top-level x64 configuration so the entire
project can be built as 64 bit. Previously, we only supported
a 64 bit override for individual targets (via msvs_target_platform).

'asm' files were a bit confused before; the intention was that all .asm
be built on Win32, but they were only being built if the msvs_target_platform
was explicitly set which was very confusing. So, support .asm still, but if
the target overrides asm with a rule, then use that one instead, similar to
.idl files.

BUG=chromium:8606
Committed: https://code.google.com/p/gyp/source/detail?r=1534

Patch Set 1 #

Patch Set 2 : remove debug prints #

Total comments: 1

Patch Set 3 : fix test #

Patch Set 4 : remove unrelated file #

Total comments: 3

Patch Set 5 : review fix #

Patch Set 6 : allow rule override of asm on windows + test #

Unified diffs Side-by-side diffs Delta from patch set Stats (+125 lines, -48 lines) Lint Patch
M pylib/gyp/generator/ninja.py View 1 2 3 4 5 4 chunks +6 lines, -5 lines 0 comments 0 errors Download
M pylib/gyp/msvs_emulation.py View 1 2 3 4 5 14 chunks +51 lines, -31 lines 0 comments 0 errors Download
A test/assembly/gyptest-override.py View 1 2 3 4 5 1 chunk +24 lines, -0 lines 0 comments 0 errors Download
A test/assembly/src/override.gyp View 1 2 3 4 5 1 chunk +34 lines, -0 lines 0 comments 0 errors Download
A test/assembly/src/override_asm.asm View 1 2 3 4 5 1 chunk +8 lines, -0 lines 0 comments 0 errors Download
D test/rules/src/subdir4/asm-function.asm View 1 2 1 chunk +0 lines, -10 lines 0 comments 0 errors Download
A + test/rules/src/subdir4/asm-function.assem View 1 2 0 chunks +-1 lines, --1 lines 0 comments 0 errors Download
M test/rules/src/subdir4/build-asm.gyp View 1 2 1 chunk +3 lines, -3 lines 0 comments 0 errors Download
Commit:

Messages

Total messages: 14
scottmg
Refactor a bit to support building x64 at top-level too.
1 year, 5 months ago #1
Sam Clegg
https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py File pylib/gyp/msvs_emulation.py (right): https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py#newcode226 pylib/gyp/msvs_emulation.py:226: return 'x64' if platform.endswith('x64') else 'x86' Doesn't this break ...
1 year, 5 months ago #2
scottmg
On 2012/11/08 20:14:57, Sam Clegg wrote: > https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py > File pylib/gyp/msvs_emulation.py (right): > > https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py#newcode226 ...
1 year, 5 months ago #3
scottmg
On 2012/11/08 20:14:57, Sam Clegg wrote: > https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py > File pylib/gyp/msvs_emulation.py (right): > > https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py#newcode226 ...
1 year, 5 months ago #4
Sam Clegg
On 2012/11/08 21:47:00, scottmg wrote: > On 2012/11/08 20:14:57, Sam Clegg wrote: > > https://codereview.chromium.org/11363143/diff/2001/pylib/gyp/msvs_emulation.py ...
1 year, 5 months ago #5
Sam Clegg
On 2012/11/08 21:54:10, Sam Clegg wrote: > On 2012/11/08 21:47:00, scottmg wrote: > > On ...
1 year, 5 months ago #6
scottmg
To recap what Sam and I talked through, ninja effectively understands 'Win32' and 'x64' as ...
1 year, 5 months ago #7
scottmg
http://codereview.chromium.org/11363143/diff/7004/test/rules/src/subdir4/build-asm.gyp File test/rules/src/subdir4/build-asm.gyp (right): http://codereview.chromium.org/11363143/diff/7004/test/rules/src/subdir4/build-asm.gyp#newcode26 test/rules/src/subdir4/build-asm.gyp:26: 'asm-function.assem', We _weren't_ running the implicit .asm build rule ...
1 year, 5 months ago #8
scottmg
ping, brad (or sam if you feel qualified)
1 year, 5 months ago #9
bradn
Much of it seems like good refatoring, but I'm clearly missing what was broken before ...
1 year, 5 months ago #10
scottmg
(and added to description) https://chromiumcodereview.appspot.com/11363143/diff/7004/pylib/gyp/msvs_emulation.py File pylib/gyp/msvs_emulation.py (right): https://chromiumcodereview.appspot.com/11363143/diff/7004/pylib/gyp/msvs_emulation.py#newcode240 pylib/gyp/msvs_emulation.py:240: config = config[:-4] On 2012/11/13 ...
1 year, 5 months ago #11
bradn
LGTM, with nits. Could we make the commit message a little more clear? From our ...
1 year, 5 months ago #12
scottmg
On 2012/11/13 18:25:50, bradn wrote: > LGTM, with nits. > > Could we make the ...
1 year, 5 months ago #13
bradn
1 year, 5 months ago #14
Cool. LGTM
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1280:2d3e6564b7b6