Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Issue 28207: Start stitching GYP-generated files into the Linux build:... (Closed)

Created:
11 years, 10 months ago by sgk
Modified:
9 years, 5 months ago
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Start stitching GYP-generated files into the Linux build: * Add a GYP=1 command-line variable to use the gyp-generated files (which are generated side-by-side until everything's okay enough to cut over for real). * Rearrange existing *.scons files to match the layout of the gyp-generated ones, so the transition will be easier: * base.scons (the wrapping logic that calls the other *.scons files) => base_sln.scons * base_lib.scons (the library itself) => base.scons (matching the gyp target generation) * gfx/base_gfx.scons => base_gfx.scons (with necessary prepending of "gfx/" to path names) build/SConscript.main fixes: * Use an internal ${_GYP} infix variable to select the right flavor of *.scons file (multiple places) * When building with GYP=1, only load the one component *_sln_gyp.scons file, because gyp has already created it with knowledge of all the right dependent *_gyp.scons files to load. Linux gyp build fixes: * Add -32 to $ASFLAGS for generating a 32-bit libicudata.a from the now-checked in .s. * Add -Wno-unused and -Wno-unused-function to skia. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10759

Patch Set 1 #

Patch Set 2 : '' #

Patch Set 3 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+66 lines, -635 lines) Patch
A + base/base_gfx.scons View 1 chunk +19 lines, -19 lines 0 comments Download
D base/base_lib.scons View 1 2 1 chunk +0 lines, -475 lines 0 comments Download
A + base/base_main.scons View 1 chunk +16 lines, -35 lines 0 comments Download
D base/gfx/base_gfx.scons View 1 2 1 chunk +0 lines, -95 lines 0 comments Download
M build/SConscript.main View 1 2 6 chunks +25 lines, -11 lines 0 comments Download
M skia/skia.gyp View 2 1 chunk +6 lines, -0 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
sgk
Sending this out for review while I work on a corresponding prerequisite update for icu38. ...
11 years, 10 months ago (2009-02-26 20:14:41 UTC) #1
Mark Mentovai
This LGTM, but I'm not sure I understand the approach entirely. It seems like you ...
11 years, 10 months ago (2009-02-26 20:33:56 UTC) #2
tony
base.scons seems to be missing from this patch. Will scons be generating the .sln files ...
11 years, 10 months ago (2009-02-27 01:34:16 UTC) #3
sgk
11 years, 10 months ago (2009-02-27 19:07:37 UTC) #4
I think base.scons might not be showing up here because this CL is
simultaneously moving the old base.scons to base_main.scons, and moving the old
base_lib.scons to base.scons, with no content changes.  This ends up looking
like this in my 'svn st' output:

A  +   base_main.scons
R  +   base.scons
A  +   base_gfx.scons
D      gfx/base_gfx.scons
D      base_lib.scons

Powered by Google App Engine
This is Rietveld 408576698