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

Issue 11430: Fix use of LOAD= with WantSystemLib()... (Closed)

Created:
12 years, 1 month ago by sgk
Modified:
9 years, 5 months ago
Reviewers:
evanm, bradn, Evan Martin
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Fix use of LOAD= with WantSystemLib() (we could blow up if a variable hadn't been added to the config) and extend use of LOAD= into submodules: * Add a ChromeLoadSConscriptModules() method that encapsulates the conditional logic, and makes things more readable by specifying component names as keyword arguments, not hard-coding the logic as a series of if-tests. * Put the ChromeLoadSConscriptModules() logic in a Tool module in site_scons/site_tools, so it doesn't clutter up build/SConscript.main directly. * Move env.WantSystemLib() calls into the individual *.scons files, so we call them each time (or not, based one LOAD=) and the config itself just returns if the system library is requested and we don't need to build anything locally. * Move the settings where a library name changes based on whether or not the system lib is being used into the using_*.scons files, so they're available to clients independently of whether or not the component's *.scons configuration is loaded. * While here: rename the affected third_party SConscript files: third_party/libjpeg/SConscript => third_party/libjpeg/libjpeg.scons third_party/libxml/SConscript => third_party/libxml/libxml.scons third_party/libxslt/SConscript => third_party/libxslt/libxslt.scons * While here: move the Chrome{Program,SharedLibrary}() etc. builder definitions from build/SConscript.main to a new too Ad the ChromeLoadSConscriptModules() logic in a Tool module, to remove more clutter from build/SConscript.main. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=5820

Patch Set 1 #

Patch Set 2 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+255 lines, -609 lines) Patch
M build/SConscript.main View 1 3 chunks +38 lines, -129 lines 0 comments Download
M build/SConscript.v8 View 1 1 chunk +3 lines, -0 lines 2 comments Download
M chrome/chrome.scons View 2 chunks +34 lines, -33 lines 2 comments Download
A site_scons/site_tools/chromium_builders.py View 1 chunk +35 lines, -0 lines 2 comments Download
A site_scons/site_tools/chromium_load_component.py View 1 chunk +81 lines, -0 lines 0 comments Download
M third_party/bzip2/bzip2.scons View 1 2 chunks +9 lines, -6 lines 0 comments Download
M third_party/bzip2/using_bzip2.scons View 1 chunk +4 lines, -5 lines 0 comments Download
M third_party/libjpeg/SConscript View 1 1 chunk +0 lines, -99 lines 0 comments Download
A + third_party/libjpeg/libjpeg.scons View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/libpng/libpng.scons View 1 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/libxml/SConscript View 1 1 chunk +0 lines, -157 lines 0 comments Download
A + third_party/libxml/libxml.scons View 2 chunks +3 lines, -3 lines 0 comments Download
M third_party/libxml/using_libxml.scons View 2 chunks +4 lines, -24 lines 0 comments Download
M third_party/libxslt/SConscript View 1 1 chunk +0 lines, -131 lines 0 comments Download
A + third_party/libxslt/libxslt.scons View 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/lzma_sdk/lzma_sdk.scons View 1 1 chunk +3 lines, -0 lines 0 comments Download
M third_party/zlib/zlib.scons View 1 1 chunk +8 lines, -0 lines 0 comments Download
M webkit/SConscript View 2 chunks +22 lines, -20 lines 0 comments Download
M webkit/tools/test_shell/SConscript View 2 chunks +2 lines, -2 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
sgk
Evan: I ran into this quirk in how WantSystemLib() depended on variables like XML_LIB, and ...
12 years, 1 month ago (2008-11-20 20:39:01 UTC) #1
bradn
LGTM
12 years, 1 month ago (2008-11-20 20:44:37 UTC) #2
Evan Martin
random style http://codereview.chromium.org/11430/diff/210/18 File build/SConscript.v8 (right): http://codereview.chromium.org/11430/diff/210/18#newcode10 Line 10: Return() four spaces :\ http://codereview.chromium.org/11430/diff/210/29 File ...
12 years, 1 month ago (2008-11-20 21:11:42 UTC) #3
sgk
12 years, 1 month ago (2008-11-21 01:06:28 UTC) #4
http://codereview.chromium.org/11430/diff/210/18
File build/SConscript.v8 (right):

http://codereview.chromium.org/11430/diff/210/18#newcode10
Line 10: Return()
On 2008/11/20 21:11:42, Evan Martin wrote:
> four spaces :\

Thanks for the catch; done.  (Also in other uses.)

http://codereview.chromium.org/11430/diff/210/29
File chrome/chrome.scons (right):

http://codereview.chromium.org/11430/diff/210/29#newcode56
Line 56: activex_test_controls =
'test/activex_test_control/activex_test_control.scons',
On 2008/11/20 21:11:42, Evan Martin wrote:
> 80 columns :\

Done.

http://codereview.chromium.org/11430/diff/210/27
File site_scons/site_tools/chromium_builders.py (right):

http://codereview.chromium.org/11430/diff/210/27#newcode12
Line 12: def ChromeProgram(env, *args, **kw):
On 2008/11/20 21:11:42, Evan Martin wrote:
> two-space tabs :\

Done; also in other chrome*py module.

Powered by Google App Engine
This is Rietveld 408576698