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

Issue 42340: Update the gyp Linux build: (Closed)

Created:
11 years, 9 months ago by sgk
Modified:
6 years, 11 months ago
Reviewers:
Mark Mentovai, agl, bradn
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Update the gyp Linux build: * Add Linux settings to target_defaults in common.gypi so gyp-generated SConscript files no longer depend on build/SConscript.main or the Hammer infrastructure. * Copy the FilterOut() function from Hammer to the chromium_builders.py Tool module. * Add a ChromiumLoadableModule() builder to chromium_builders.py. * Add dependencies on the 'views' library to the chrome link (target 'app'). * Add missing views/*/*_unittest.cc modules to the 'unit_tests' target. Exclude all but the one that builds on Linux from the non-Windows builds. * Crib a list of chrome/views files to exclude from the Linux build from the old SCons configuration. * Add a new build/linux/system.gyp file with new 'settings' targets to encapsulate the pkg-config checks for gtk+-2.0, nss and pangoft2. * Add depenedencies in the other targets on the new gtk, nss and pangoft2 'settings' targets from build/linux/system.gyp. * Add a pkg_config_wrapper.py script that keeps gyp happy by simply exiting 0 if the package isn't found. * DEPS roll for latest gyp changes to support the above. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=12228

Patch Set 1 #

Total comments: 6

Patch Set 2 : '' #

Patch Set 3 : '' #

Patch Set 4 : '' #

Total comments: 9

Patch Set 5 : '' #

Patch Set 6 : '' #

Patch Set 7 : '' #

Patch Set 8 : '' #

Total comments: 14

Patch Set 9 : '' #

Total comments: 3

Patch Set 10 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+421 lines, -13 lines) Patch
M DEPS View 5 6 7 8 9 1 chunk +1 line, -1 line 0 comments Download
M base/base.gyp View 1 2 3 4 5 6 7 8 9 4 chunks +32 lines, -1 line 0 comments Download
M build/common.gypi View 1 2 3 4 5 6 7 8 9 1 chunk +70 lines, -0 lines 0 comments Download
A build/linux/pkg_config_wrapper.py View 5 6 7 8 1 chunk +30 lines, -0 lines 0 comments Download
A build/linux/system.gyp View 1 chunk +50 lines, -0 lines 0 comments Download
M chrome/chrome.gyp View 2 3 4 5 6 7 8 9 18 chunks +126 lines, -8 lines 0 comments Download
M media/media.gyp View 9 1 chunk +11 lines, -0 lines 0 comments Download
M net/net.gyp View 2 3 4 5 6 7 8 9 2 chunks +8 lines, -0 lines 0 comments Download
M site_scons/site_tools/chromium_builders.py View 2 3 4 5 6 7 8 9 4 chunks +44 lines, -0 lines 0 comments Download
M skia/skia.gyp View 1 2 3 4 5 6 7 8 9 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/libxml/libxml.gyp View 9 2 chunks +18 lines, -0 lines 0 comments Download
M webkit/tools/test_shell/test_shell.gyp View 9 5 chunks +11 lines, -0 lines 0 comments Download
M webkit/webkit.gyp View 2 3 4 5 6 7 8 9 4 chunks +17 lines, -3 lines 0 comments Download

Messages

Total messages: 10 (0 generated)
sgk
This is preliminary. Appreciate a thumbs up/down on whether this looks in the ballpark before ...
11 years, 9 months ago (2009-03-18 17:27:07 UTC) #1
agl
This looks like what I was expecting. For certain build systems, we don't need the ...
11 years, 9 months ago (2009-03-18 17:34:07 UTC) #2
sgk
http://codereview.chromium.org/42340/diff/1/3 File build/common.gypi (right): http://codereview.chromium.org/42340/diff/1/3#newcode98 Line 98: '-march=i686', On 2009/03/18 17:34:07, agl wrote: > march ...
11 years, 9 months ago (2009-03-18 21:18:43 UTC) #3
sgk
Mark, please take a look at the TODO(mmentovai) comments in chrome.gyp and let me know ...
11 years, 9 months ago (2009-03-20 00:47:41 UTC) #4
Mark Mentovai
http://codereview.chromium.org/42340/diff/31/2018 File base/base.gyp (right): http://codereview.chromium.org/42340/diff/31/2018#newcode328 Line 328: 'libraries': [ If you are putting libraries into ...
11 years, 9 months ago (2009-03-20 14:28:07 UTC) #5
Mark Mentovai
An additional idea I had that I actually like quite a lot is to provide ...
11 years, 9 months ago (2009-03-20 15:37:34 UTC) #6
sgk
Updated with new 'settings' targets. Looking much cleaner.
11 years, 9 months ago (2009-03-20 19:14:24 UTC) #7
Mark Mentovai
system.gyp is missing. This change is a substantial improvement. I still think we can probably ...
11 years, 9 months ago (2009-03-20 19:24:22 UTC) #8
sgk
Uploaded another version. Added changes to media/media.gyp and webkit/tools/test_shell/test_shell.gyp. http://codereview.chromium.org/42340/diff/2066/45 File base/base.gyp (right): http://codereview.chromium.org/42340/diff/2066/45#newcode563 Line ...
11 years, 9 months ago (2009-03-20 21:15:39 UTC) #9
Mark Mentovai
11 years, 9 months ago (2009-03-20 21:20:28 UTC) #10
LGTM

I really like how this turned out!

Thanks for adding the comments on some of the weirder gtk dependencies.

http://codereview.chromium.org/42340/diff/56/2078
File DEPS (right):

http://codereview.chromium.org/42340/diff/56/2078#newcode29
Line 29: "http://gyp.googlecode.com/svn/trunk@382",
Brad should have this covered now.

http://codereview.chromium.org/42340/diff/56/2082
File build/linux/system.gyp (right):

http://codereview.chromium.org/42340/diff/56/2082#newcode1
Line 1: # Copyright (c) 2009 The Chromium Authors. All rights reserved.
svn:eol-style = LF

(sometimes Rietveld doesn't show these even when they're there, so I can't be
sure if you've set it or not.)

http://codereview.chromium.org/42340/diff/56/2082#newcode12
Line 12: '<!@(python ../build/linux/pkg_config_wrapper.py --cflags gtk+-2.0)',
Reminds me, I have to fix the cwd problem.  This will do for now.

Powered by Google App Engine
This is Rietveld 408576698