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

5 files changed, 8 insertions, 118 deletions

diff --git a/sandbox/src/sandbox_lib.scons b/sandbox/src/sandbox_lib.scons
index 4232ff8..493f3be 100644
--- a/sandbox/src/sandbox_lib.scons
+++ b/sandbox/src/sandbox_lib.scons
@@ -6,29 +6,13 @@ Import('env')
 
 env = env.Clone()
 
-env.SConscript([
+env.ApplySConscript([
     '$GTEST_DIR/../using_gtest.scons',
-], {'env':env})
-
-# Some of the sandbox sources include "gtest.h", so we need it
-# in the base env here, not just in env_tests.
-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
       ],
   )
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',
     ],