Fix use of LOAD= with WantSystemLib() (we could blow up if a variable

hadn't been added to the config) and extend use of LOAD= into submodules:
* Add a ChromeLoadSConscriptModules() method that encapsulates the
  conditional logic, and makes things more readable by specifying
  component names as keyword arguments, not hard-coding the logic
  as a series of if-tests.
* Put the ChromeLoadSConscriptModules() logic in a Tool module in
  site_scons/site_tools, so it doesn't clutter up
  build/SConscript.main directly.
* Move env.WantSystemLib() calls into the individual *.scons files,
  so we call them each time (or not, based one LOAD=) and the config
  itself just returns if the system library is requested and we
  don't need to build anything locally.
* Move the settings where a library name changes based on whether or
  not the system lib is being used into the using_*.scons files,
  so they're available to clients independently of whether or not the
  component's *.scons configuration is loaded.
* While here:  rename the affected third_party SConscript files:
  third_party/libjpeg/SConscript => third_party/libjpeg/libjpeg.scons
  third_party/libxml/SConscript => third_party/libxml/libxml.scons
  third_party/libxslt/SConscript => third_party/libxslt/libxslt.scons
* While here:  move the Chrome{Program,SharedLibrary}() etc. builder
  definitions from build/SConscript.main to a new too
  Ad the ChromeLoadSConscriptModules() logic in a Tool module,
  to remove more clutter from build/SConscript.main.
Review URL: http://codereview.chromium.org/11430

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5820 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 20 deletions

diff --git a/webkit/SConscript b/webkit/SConscript
index 08b05fe..237b113 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -211,28 +211,31 @@ env.Append(
 )
 
 # This list is the SConscripts that work on Windows and Linux.
-sconscript_dirs = [
-  'SConscript.port',
-  'SConscript.javascriptcore_pcre',
-  'build/JSConfig/SConscript',
-  'build/JavaScriptCore/SConscript',
-  'build/localized_strings/SConscript',
-  'build/port/SConscript',
-  'build/V8Bindings/SConscript',
-  'build/WebCore/SConscript',
-  'default_plugin/SConscript',
-  'glue/SConscript',
-  'glue/plugins/test/SConscript',
-  'tools/npapi_layout_test_plugin/SConscript',
-  'tools/test_shell/SConscript',
-]
+sconscript_dirs = env.ChromiumLoadComponentSConscripts(
+  LOAD_NAMES = ['webkit'],
+  port = 'SConscript.port',
+  JavaScriptCore_pcre = 'SConscript.javascriptcore_pcre',
+  WebCore_config_h = 'build/JSConfig/SConscript',
+  JavaScriptCore = 'build/JavaScriptCore/SConscript',
+  webkit_strings = 'build/localized_strings/SConscript',
+  bindings = 'build/port/SConscript',
+  V8Bindings = 'build/V8Bindings/SConscript',
+  WebCore = 'build/WebCore/SConscript',
+  default_plugin = 'default_plugin/SConscript',
+  glue = 'glue/SConscript',
+  npapi_test_plugin = 'glue/plugins/test/SConscript',
+  npapi_layout_test_plugin = 'tools/npapi_layout_test_plugin/SConscript',
+  test_shell = 'tools/test_shell/SConscript',
+)
+
 if env['PLATFORM'] == 'win32':
   # These extra dirs aren't win32-specific, they're just the dirs that
   # haven't yet been made portable.
-  sconscript_dirs.extend([
-    'activex_shim/SConscript',
-    'activex_shim_dll/SConscript',
-  ])
+  sconscript_dirs.extend(env.ChromiumLoadComponentSConscripts(
+    LOAD_NAMES = ['webkit'],
+    activex_shim = 'activex_shim/SConscript',
+    npaxshim = 'activex_shim_dll/SConscript',
+  ))
 
   env.Append(
     CPPDEFINES = [
@@ -272,4 +275,3 @@ version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h',
                        '$CHROME_SRC_DIR/webkit/build/webkit_version.py'],
                       "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
 env.AlwaysBuild(version)
-