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

Issue 11478: Finish replicating the *.vsprops structure. (Closed)

Created:
12 years, 1 month ago by sgk
Modified:
9 years, 5 months ago
Reviewers:
tony, M-A Ruel, bradn
CC:
chromium-reviews_googlegroups.com
Visibility:
Public.

Description

Finish release (opt) builds on Windows, including the parallel build\*.scons structure (mirroring build\*.vsprops files): * Use env.ApplySConscript() instead of env.SConscript with a hand-crafted dictionary defining 'env'. * Move various CPPPATH, CCFLAGS, CPPDEFINES, LIBS and LIBPATH definitions from build/SConscript.main and target-specific *.scons files into the build\*.scons files that mirror the existing build\*.vsprops hierarchy. * Use the new build\{debug,release}.scons files to update the windows_dbg and windows_opt construction environments. * Mirror current support for CHROME_BUILD_TYPE and CHROMIUM_BUILD external environment variables. * Remove hard-coded /TP options. * Massage $CXXFLAGS to remove $CCFLAGS, avoiding duplication of options on command lines. Handle the ripple effect in $PCHCOM by adding $CCFLAGS back to that command line. * Delete hammer's default settings of {CC,LINK}FLAGS_{DEBUG,OPTIMIZED} so they don't pollute our construction environments. * Update chrome config to link against v8 for opt, v8_g for dbg. * Get rid of fragile by-hand order of using_net.scons before other using_*.scons files. We're now using --start-group and --end-group on Linux to deal with dependency cycles in libraries. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=5741

Patch Set 1 #

Patch Set 2 : '' #

Patch Set 3 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+498 lines, -386 lines) Patch
M base/base_lib.scons View 1 chunk +2 lines, -9 lines 0 comments Download
M base/base_unittests.scons View 3 chunks +4 lines, -24 lines 0 comments Download
M base/gfx/base_gfx.scons View 1 chunk +2 lines, -9 lines 0 comments Download
M build/SConscript.main View 1 2 6 chunks +45 lines, -70 lines 0 comments Download
A build/common.scons View 1 chunk +16 lines, -0 lines 0 comments Download
A build/debug.scons View 1 chunk +35 lines, -0 lines 0 comments Download
A build/external_code.scons View 1 1 chunk +28 lines, -0 lines 0 comments Download
A build/internal/chromium_build.scons View 1 chunk +15 lines, -0 lines 0 comments Download
A build/internal/chromium_build_google_chrome.scons View 1 chunk +15 lines, -0 lines 0 comments Download
A build/internal/essential.scons View 1 2 1 chunk +97 lines, -0 lines 0 comments Download
A build/internal/release_defaults.scons View 1 2 1 chunk +35 lines, -0 lines 0 comments Download
A build/internal/release_impl.scons View 1 2 1 chunk +18 lines, -0 lines 0 comments Download
A build/internal/release_impl_checksenabled.scons View 1 2 1 chunk +33 lines, -0 lines 0 comments Download
A build/internal/release_impl_coverage.scons View 1 chunk +17 lines, -0 lines 0 comments Download
A build/internal/release_impl_dom_stats.scons View 1 chunk +31 lines, -0 lines 0 comments Download
A build/internal/release_impl_official.scons View 1 2 1 chunk +30 lines, -0 lines 0 comments Download
A build/internal/release_impl_purify.scons View 1 2 1 chunk +29 lines, -0 lines 0 comments Download
A build/release.scons View 1 1 chunk +18 lines, -0 lines 0 comments Download
M chrome/SConscript View 2 chunks +4 lines, -2 lines 0 comments Download
M chrome/test/interactive_ui/interactive_ui_tests.scons View 2 chunks +1 line, -1 line 0 comments Download
M chrome/tools/test/image_diff/image_diff.scons View 1 chunk +0 lines, -3 lines 0 comments Download
M net/crash_cache.scons View 1 chunk +3 lines, -28 lines 0 comments Download
M net/net_lib.scons View 1 chunk +2 lines, -10 lines 0 comments Download
M net/net_perftests.scons View 1 chunk +3 lines, -29 lines 0 comments Download
M net/net_resources.scons View 1 chunk +0 lines, -3 lines 0 comments Download
M net/net_unittests.scons View 2 chunks +2 lines, -25 lines 0 comments Download
M net/stress_cache.scons View 1 chunk +3 lines, -28 lines 0 comments Download
M net/tools/tld_cleanup/tld_cleanup.scons View 1 2 1 chunk +2 lines, -23 lines 0 comments Download
M sandbox/src/sandbox_lib.scons View 1 chunk +2 lines, -18 lines 0 comments Download
M sandbox/tests/common/sandbox_common.scons View 1 chunk +0 lines, -13 lines 0 comments Download
M sandbox/tests/integration_tests/sbox_integration_tests.scons View 1 chunk +2 lines, -31 lines 0 comments Download
M sandbox/tests/unit_tests/sbox_unittests.scons View 1 chunk +2 lines, -30 lines 0 comments Download
M sandbox/tests/validation_tests/sbox_validation_tests.scons View 1 chunk +2 lines, -26 lines 0 comments Download
M webkit/SConscript View 1 chunk +0 lines, -2 lines 0 comments Download
M webkit/build/JavaScriptCore/SConscript View 1 chunk +0 lines, -2 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
sgk
maruel, I'd especially appreciate your eyes on the settings in the build\**.scons files to make ...
12 years, 1 month ago (2008-11-19 20:37:26 UTC) #1
bradn
http://codereview.chromium.org/11478/diff/40/253 File build/SConscript.main (right): http://codereview.chromium.org/11478/diff/40/253#newcode166 Line 166: # Stray comment? http://codereview.chromium.org/11478/diff/40/253#newcode296 Line 296: del windows_env['CCFLAGS_OPTIMIZED'] ...
12 years, 1 month ago (2008-11-19 20:44:16 UTC) #2
M-A Ruel
http://codereview.chromium.org/11478/diff/40/266 File build/internal/essential.scons (right): http://codereview.chromium.org/11478/diff/40/266#newcode37 Line 37: '/Gy', # VCCLCompilerTool.EnableFunctionLevelLinking="true" no need to put so ...
12 years, 1 month ago (2008-11-19 21:09:41 UTC) #3
sgk
12 years, 1 month ago (2008-11-19 22:06:00 UTC) #4
Updated with fixes re: comments; thanks.

http://codereview.chromium.org/11478/diff/40/253
File build/SConscript.main (right):

http://codereview.chromium.org/11478/diff/40/253#newcode166
Line 166: #
On 2008/11/19 20:44:16, bradn wrote:
> Stray comment?

Updated with explanatory text.

http://codereview.chromium.org/11478/diff/40/253#newcode296
Line 296: del windows_env['CCFLAGS_OPTIMIZED']
On 2008/11/19 20:44:16, bradn wrote:
> What about LINKFLAGS_OPTIMIZED?

LINKFLAGS_OPTIMIZED is actually not set by target_platform_windows--which
reinforces that we should change the underlying mechanism, because a consumer
like chrome shouldn't have to know about and undo internal things like this.

http://codereview.chromium.org/11478/diff/40/266
File build/internal/essential.scons (right):

http://codereview.chromium.org/11478/diff/40/266#newcode37
Line 37: '/Gy',                #
VCCLCompilerTool.EnableFunctionLevelLinking="true"
On 2008/11/19 21:09:41, M-A wrote:
> no need to put so much spaces, you break the 80 cols.

Done.

http://codereview.chromium.org/11478/diff/40/262
File build/internal/release_defaults.scons (right):

http://codereview.chromium.org/11478/diff/40/262#newcode23
Line 23: if env['PLATFORM'] == 'win32':
On 2008/11/19 20:44:16, bradn wrote:
> Can't this move to env.Bit('windows') ?
> 
> 

Done.

http://codereview.chromium.org/11478/diff/40/260
File build/internal/release_impl.scons (right):

http://codereview.chromium.org/11478/diff/40/260#newcode13
Line 13: if env['PLATFORM'] == 'win32':
On 2008/11/19 20:44:16, bradn wrote:
> env.Bit('windows')

Done.

http://codereview.chromium.org/11478/diff/40/256
File build/internal/release_impl_checksenabled.scons (right):

http://codereview.chromium.org/11478/diff/40/256#newcode21
Line 21: if env['PLATFORM'] == 'win32':
On 2008/11/19 20:44:16, bradn wrote:
> env.Bit('windows')

Done.

http://codereview.chromium.org/11478/diff/40/257
File build/internal/release_impl_official.scons (right):

http://codereview.chromium.org/11478/diff/40/257#newcode24
Line 24: '/GT',            #
VCCLCompilerTool.EnableFiberSafeOptimizations="true"
On 2008/11/19 21:09:41, M-A wrote:
> 80 cols

Done.

http://codereview.chromium.org/11478/diff/40/258
File build/internal/release_impl_pgo_instrument.scons (right):

http://codereview.chromium.org/11478/diff/40/258#newcode35
Line 35: #		CommandLine="xcopy /D /Y
"$(DevEnvDir)..\..\VC\bin\pgort80.dll" "$(OutDir)""
On 2008/11/19 21:09:41, M-A wrote:
> Don't replicate the _pgo_ files for now, it's unnecessary.

Excellent.  Done.

http://codereview.chromium.org/11478/diff/40/265
File build/internal/release_impl_pgo_optimize.scons (right):

http://codereview.chromium.org/11478/diff/40/265#newcode1
Line 1: # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
On 2008/11/19 21:09:41, M-A wrote:
> discard this file.

Done.

http://codereview.chromium.org/11478/diff/40/259
File build/internal/release_impl_purify.scons (right):

http://codereview.chromium.org/11478/diff/40/259#newcode19
Line 19: if env['PLATFORM'] == 'win32':
On 2008/11/19 20:44:16, bradn wrote:
> env.Bit('windows')

Done.

http://codereview.chromium.org/11478/diff/40/273
File chrome/tools/test/image_diff/image_diff.scons (right):

http://codereview.chromium.org/11478/diff/40/273#newcode27
Line 27: '/INCREMENTAL',
On 2008/11/19 21:09:41, M-A wrote:
> This should be in essential

There are a bunch of these in a lot of the *.scons files under chrome.  I'm
going to take care of those en masse as a separate CL.

http://codereview.chromium.org/11478/diff/40/243
File net/net_resources.scons (right):

http://codereview.chromium.org/11478/diff/40/243#newcode14
Line 14: RCFLAGS = [
On 2008/11/19 21:09:41, M-A wrote:
> This should be in essential

Good catch, thanks.  I'll take care of that in the more detailed follow-on for
the chrome\**.scons files.

http://codereview.chromium.org/11478/diff/40/242
File net/tools/tld_cleanup/tld_cleanup.scons (right):

http://codereview.chromium.org/11478/diff/40/242#newcode23
Line 23: '/INCREMENTAL',
On 2008/11/19 21:09:41, M-A wrote:
> uh?

Done.

http://codereview.chromium.org/11478/diff/40/246
File sandbox/tests/unit_tests/sbox_unittests.scons (right):

http://codereview.chromium.org/11478/diff/40/246#newcode18
Line 18: '/WX',          # treat warnings as errors
On 2008/11/19 21:09:41, M-A wrote:
> Eventually, I hope to have this moved too.

Agreed.  I tried enabling /WX in essential.scons but ran into errors, so I
commented it out for now with a TODO(sgk).  When that gets fixed and re-enabled
globally, I'll pull out the individual /WX settings in these *.scons files.

Powered by Google App Engine
This is Rietveld 408576698