From 5c6f1c6b32f9da207706cf2d94560196e9d20303 Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Thu, 20 Nov 2008 01:12:38 +0000 Subject: 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 --- sandbox/tests/common/sandbox_common.scons | 13 --------- .../integration_tests/sbox_integration_tests.scons | 33 ++-------------------- sandbox/tests/unit_tests/sbox_unittests.scons | 32 ++------------------- .../validation_tests/sbox_validation_tests.scons | 28 ++---------------- 4 files changed, 6 insertions(+), 100 deletions(-) (limited to 'sandbox/tests') diff --git a/sandbox/tests/common/sandbox_common.scons b/sandbox/tests/common/sandbox_common.scons index afd36a0..b1b101c 100644 --- a/sandbox/tests/common/sandbox_common.scons +++ b/sandbox/tests/common/sandbox_common.scons @@ -6,21 +6,8 @@ Import('env') env = env.Clone() -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) - if env['PLATFORM'] == 'win32': env.Append( - CPPDEFINES = [ - '_SECURE_ATL', - '_WINDOWS', - ], CCFLAGS = [ '/WX', # treat warnings as errors ], diff --git a/sandbox/tests/integration_tests/sbox_integration_tests.scons b/sandbox/tests/integration_tests/sbox_integration_tests.scons index ad0f39a..7c8ed97 100644 --- a/sandbox/tests/integration_tests/sbox_integration_tests.scons +++ b/sandbox/tests/integration_tests/sbox_integration_tests.scons @@ -6,48 +6,19 @@ Import('env') env = env.Clone() -env.SConscript([ +env.ApplySConscript([ '$BASE_DIR/using_base.scons', '$GTEST_DIR/../using_gtest.scons', '$SANDBOX_DIR/using_sandbox.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) +]) if env['PLATFORM'] == 'win32': env.Append( - CPPDEFINES = [ - '_SECURE_ATL', - '_WINDOWS', - ], CCFLAGS = [ - '/TP', '/WX', # treat warnings as errors ], ) -env.Prepend( - LINKFLAGS = [ - '/DELAYLOAD:dwmapi.dll', - '/DELAYLOAD:uxtheme.dll', - '/MACHINE:X86', - '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], -) - - - # TODO(bradnelson): This step generates integration_tests.pch.ib_tag # SCons doesn't know. env_p = env.Clone() diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons index f311ede..02fc1b8 100644 --- a/sandbox/tests/unit_tests/sbox_unittests.scons +++ b/sandbox/tests/unit_tests/sbox_unittests.scons @@ -6,47 +6,19 @@ Import('env') env = env.Clone() -env.SConscript([ +env.ApplySConscript([ '$BASE_DIR/using_base.scons', '$GTEST_DIR/../using_gtest.scons', '$SANDBOX_DIR/using_sandbox.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) +]) if env['PLATFORM'] == 'win32': env.Append( - CPPDEFINES = [ - '_SECURE_ATL', - '_WINDOWS', - ], CCFLAGS = [ - '/TP', '/WX', # treat warnings as errors ], ) -env.Prepend( - LINKFLAGS = [ - '/DELAYLOAD:dwmapi.dll', - '/DELAYLOAD:uxtheme.dll', - '/MACHINE:X86', - '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], -) - - # TODO(bradnelson): This step generates unittests_tests.pch.ib_tag # SCons doesn't know. env_p = env.Clone() diff --git a/sandbox/tests/validation_tests/sbox_validation_tests.scons b/sandbox/tests/validation_tests/sbox_validation_tests.scons index 7320034..ba4dcae 100644 --- a/sandbox/tests/validation_tests/sbox_validation_tests.scons +++ b/sandbox/tests/validation_tests/sbox_validation_tests.scons @@ -6,44 +6,20 @@ Import('env') env = env.Clone() -env.SConscript([ +env.ApplySConscript([ '$BASE_DIR/using_base.scons', '$GTEST_DIR/../using_gtest.scons', '$SANDBOX_DIR/using_sandbox.scons', -], {'env':env}) - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'CHROMIUM_BUILD', - ], -) +]) if env['PLATFORM'] == 'win32': env.Append( - CPPDEFINES = [ - '_SECURE_ATL', - '_WINDOWS', - ], CCFLAGS = [ - '/TP', '/WX', # treat warnings as errors ], ) env.Prepend( - LINKFLAGS = [ - '/DELAYLOAD:dwmapi.dll', - '/DELAYLOAD:uxtheme.dll', - '/MACHINE:X86', - '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], LIBS = [ 'shlwapi', ], -- cgit v1.1