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, 0 insertions, 131 deletions

diff --git a/third_party/libxslt/SConscript b/third_party/libxslt/SConscript
deleted file mode 100644
index d28fb75..0000000
--- a/third_party/libxslt/SConscript
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone()
-
-env.Prepend(
-    CPPPATH = [
-        '$LIBXML_DIR/DerivedSources/include',
-        '$LIBXML_DIR/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/18n',
-        '$ZLIB_DIR',
-        'scons',
-        '.',
-        '../',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'LIBXML_STATIC',
-        'LIBXSLT_STATIC',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TC',
-          '/wd4800',
-      ],
-  )
-
-
-input_files = [
-    'libxslt/attributes.c',
-    'libxslt/attrvt.c',
-    'libxslt/documents.c',
-    'libxslt/extensions.c',
-    'libxslt/extra.c',
-    'libxslt/functions.c',
-    'libxslt/imports.c',
-    'libxslt/keys.c',
-    'libxslt/namespaces.c',
-    'libxslt/numbers.c',
-    'libxslt/pattern.c',
-    'libxslt/preproc.c',
-    'libxslt/security.c',
-    'libxslt/templates.c',
-    'libxslt/transform.c',
-    'libxslt/variables.c',
-    'libxslt/xslt.c',
-    'libxslt/xsltutils.c',
-]
-
-env.ChromeStaticLibrary('libxslt', input_files)
-
-
-if env['PLATFORM'] == 'win32':
-  config_files = [
-      # The configure.js script must be first in this list; the
-      # env.Command() call below executes the first list element.
-
-      'win32/configure.js',
-      'win32/Makefile.msvc',
-
-      'config.h.in',
-      'configure.in',
-      'libexslt.pc.in',
-      'libxslt.pc.in',
-      'libxslt.spec.in',
-      'xslt-config.in',
-      'xsltConf.sh.in',
-
-      'libexslt/exsltconfig.h.in',
-
-      'libxslt/xsltconfig.h.in',
-      'libxslt/xsltwin32config.h.in',
-      'libxslt/win32config.h',
-  ]
-
-  copied_sources = []
-  for cf in config_files:
-    result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE'))
-    copied_sources.extend(result)
-
-  env.Command(['scons/config.h'],
-              copied_sources,
-              'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS',
-              CONFIG_OPTIONS='compiler=msvc')
-elif env['PLATFORM'] == 'posix':
-  config_files = [
-      'config.h',
-      'xslt-config',
-      'libexslt/exsltconfig.h',
-      'libxslt/xsltconfig.h',
-      'libxslt/xsltwin32config.h',
-  ]
-  for cf in config_files:
-    result = env.Command('scons/' + cf, 'linux/' + cf,
-                         Copy('$TARGET', '$SOURCE'))
-