diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 01:12:38 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-20 01:12:38 +0000 |
| commit | 5c6f1c6b32f9da207706cf2d94560196e9d20303 (patch) | |
| tree | 9442eb8482e433b812c917e7c1760c3472d8dab7 /chrome | |
| parent | 73f5d66b06b9a02626a8addecb24986a88430176 (diff) | |
| download | chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.zip chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.tar.gz chromium_src-5c6f1c6b32f9da207706cf2d94560196e9d20303.tar.bz2 | |
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.
Review URL: http://codereview.chromium.org/11478
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 6 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.scons | 2 | ||||
| -rw-r--r-- | chrome/tools/test/image_diff/image_diff.scons | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index cdea2c5..848f0e6 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -63,6 +63,10 @@ if env_res['PLATFORM'] == 'win32': env_dll = env.Clone() +env_dll.ApplySConscript([ + '$CHROME_SRC_DIR/build/using_v8.scons', +]) + env_dll.Prepend( CPPPATH = [ "..", @@ -135,8 +139,6 @@ env_dll.Append( #'libevent', 'sqlite', 'views', - #'v8', - 'v8_g', 'v8_snapshot', ], ) diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons index 5f724f2..e60de9a 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.scons +++ b/chrome/test/interactive_ui/interactive_ui_tests.scons @@ -13,6 +13,7 @@ env.SConscript([ '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', '$CHROME_DIR/third_party/wtl/using_wtl.scons', '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$CHROME_SRC_DIR/build/using_v8.scons', '$GTEST_DIR/../using_gtest.scons', '$ICU38_DIR/using_icu38.scons', '$LIBJPEG_DIR/using_libjpeg.scons', @@ -54,7 +55,6 @@ env.Prepend( 'test_chrome_plugin', 'util', 'views', - 'v8_g', 'v8_snapshot', 'V8Bindings', 'WebCore', diff --git a/chrome/tools/test/image_diff/image_diff.scons b/chrome/tools/test/image_diff/image_diff.scons index b4d4a9e..540d7a1 100644 --- a/chrome/tools/test/image_diff/image_diff.scons +++ b/chrome/tools/test/image_diff/image_diff.scons @@ -16,9 +16,6 @@ env.ApplySConscript([ ]) env.Prepend( - CPPDEFINES = [ - '_DEBUG', - ], CPPPATH = [ '$CHROME_SRC_DIR', ], |