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

7 files changed, 15 insertions, 146 deletions

diff --git a/net/crash_cache.scons b/net/crash_cache.scons
index 4fc90ca..e4ec1d9 100644
--- a/net/crash_cache.scons
+++ b/net/crash_cache.scons
@@ -10,43 +10,18 @@ Import('env')
 
 env = env.Clone()
 
-env.SConscript([
-    # On Linux, dependencies must follow dependents, so...
-    # 1) net must come before base and modp_b64.
-    '$NET_DIR/using_net.scons',
-
+env.ApplySConscript([
     '$BASE_DIR/using_base.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
-], {'env':env})
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
-)
+    '$NET_DIR/using_net.scons',
+])
 
 if env['PLATFORM'] == 'win32':
   env.Prepend(
       CCFLAGS = [
-          '/TP',
           '/WX',
       ],
-      CPPDEFINES = [
-          '_WIN32_WINNT=0x0600',
-          'WINVER=0x0600',
-          '_HAS_EXCEPTIONS=0',
-      ],
-      LINKFLAGS = [
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-          '/MACHINE:X86',
-          '/FIXED:No',
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
   )
 
 input_files = [
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 707216f..818fe14 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -8,21 +8,13 @@ Configuration for building net.lib / libnet.a.
 
 Import('env')
 
-env_res = env.Clone()
-env_tests = env.Clone()
 env = env.Clone()
 
-env.SConscript([
+env.ApplySConscript([
     '$ICU38_DIR/using_icu38.scons',
     '$SDCH_DIR/using_sdch.scons',
     '$ZLIB_DIR/using_zlib.scons',
-], {'env':env})
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
-)
+])
 
 # These net files work on *all* platforms; files that don't work
 # cross-platform live below.
diff --git a/net/net_perftests.scons b/net/net_perftests.scons
index 1fbc6f1..6c62c99 100644
--- a/net/net_perftests.scons
+++ b/net/net_perftests.scons
@@ -10,51 +10,25 @@ Import('env')
 
 env = env.Clone()
 
-env.SConscript([
-    # On Linux, dependencies must follow dependents, so...
-    # 1) net must come before base and modp_b64.
-    # 2) bzip2 must come before base.
-    '$NET_DIR/using_net.scons',
-
+env.ApplySConscript([
     '$BASE_DIR/using_base.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$MODP_B64_DIR/using_modp_b64.scons',
-], {'env':env})
+    '$NET_DIR/using_net.scons',
+])
 
 if env['PLATFORM'] in ('posix', 'darwin'):
   env.SConscript([
       '$LIBEVENT_DIR/using_libevent.scons',
   ], {'env':env})
 
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
-)
-
 if env['PLATFORM'] == 'win32':
   env.Prepend(
       CCFLAGS = [
-          '/TP',
           '/WX',
       ],
-      CPPDEFINES = [
-          '_WIN32_WINNT=0x0600',
-          'WINVER=0x0600',
-          '_HAS_EXCEPTIONS=0',
-      ],
-      LINKFLAGS = [
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-          '/MACHINE:X86',
-          '/FIXED:No',
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
   )
 elif env['PLATFORM'] == 'posix':
   env.Append(
diff --git a/net/net_resources.scons b/net/net_resources.scons
index 3b25ce2..e884d52 100644
--- a/net/net_resources.scons
+++ b/net/net_resources.scons
@@ -11,9 +11,6 @@ Import('env')
 env = env.Clone()
 
 env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
     RCFLAGS = [
         ['/l', '0x409'],
     ],
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 81293c7..9f6dda8 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -10,7 +10,7 @@ Import('env')
 
 env = env.Clone()
 
-env.SConscript([
+env.ApplySConscript([
     '$BASE_DIR/using_base.scons',
     '$BZIP2_DIR/using_bzip2.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
@@ -20,41 +20,18 @@ env.SConscript([
     '$NET_DIR/using_net.scons',
     '$SDCH_DIR/using_sdch.scons',
     '$ZLIB_DIR/using_zlib.scons',
-], {'env':env})
+])
 
 if env['PLATFORM'] in ('posix', 'darwin'):
   env.SConscript([
       '$LIBEVENT_DIR/using_libevent.scons',
   ], {'env':env})
 
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
-)
-
 if env['PLATFORM'] == 'win32':
   env.Prepend(
       CCFLAGS = [
-          '/TP',
           '/WX',
       ],
-      CPPDEFINES = [
-          '_WIN32_WINNT=0x0600',
-          'WINVER=0x0600',
-          '_HAS_EXCEPTIONS=0',
-      ],
-      LINKFLAGS = [
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-          '/MACHINE:X86',
-          '/FIXED:No',
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
   )
 
 input_files = [
diff --git a/net/stress_cache.scons b/net/stress_cache.scons
index 83d976b6..09cd905 100644
--- a/net/stress_cache.scons
+++ b/net/stress_cache.scons
@@ -10,43 +10,18 @@ Import('env')
 
 env = env.Clone()
 
-env.SConscript([
-    # On Linux, dependencies must follow dependents, so...
-    # 1) net must come before base and modp_b64.
-    '$NET_DIR/using_net.scons',
-
+env.ApplySConscript([
     '$BASE_DIR/using_base.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
-], {'env':env})
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
-)
+    '$NET_DIR/using_net.scons',
+])
 
 if env['PLATFORM'] == 'win32':
   env.Prepend(
       CCFLAGS = [
-          '/TP',
           '/WX',
       ],
-      CPPDEFINES = [
-          '_WIN32_WINNT=0x0600',
-          'WINVER=0x0600',
-          '_HAS_EXCEPTIONS=0',
-      ],
-      LINKFLAGS = [
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-          '/MACHINE:X86',
-          '/FIXED:No',
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
-      ],
   )
 
 input_files = [
diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons
index a8380c2..6b579f0 100644
--- a/net/tools/tld_cleanup/tld_cleanup.scons
+++ b/net/tools/tld_cleanup/tld_cleanup.scons
@@ -10,38 +10,17 @@ Import('env')
 
 env = env.Clone()
 
-env.SConscript([
+env.ApplySConscript([
     '$BASE_DIR/using_base.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$NET_DIR/using_net.scons',
-], {'env':env})
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_SRC_DIR',
-    ],
-)
+])
 
 if env['PLATFORM'] == 'win32':
   env.Append(
-      CCFLAGS = [
-          '/TP',
-      ],
-
       LINKFLAGS = [
-          '/INCREMENTAL',
-          '/MANIFEST',
-          '/DELAYLOAD:"dwmapi.dll"',
-          '/DELAYLOAD:"uxtheme.dll"',
-          '/DEBUG',
           '/SUBSYSTEM:CONSOLE',
-          '/MACHINE:X86',
-          '/FIXED:No',
-          '/safeseh',
-          '/dynamicbase',
-          '/ignore:4199',
-          '/nxcompat',
       ],
   )