Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(910)

Unified Diff: webkit/SConscript

Issue 11430: Fix use of LOAD= with WantSystemLib()... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/SConscript
===================================================================
--- webkit/SConscript (revision 5775)
+++ webkit/SConscript (working copy)
@@ -211,28 +211,31 @@
)
# 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 @@
'$CHROME_SRC_DIR/webkit/build/webkit_version.py'],
"$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}")
env.AlwaysBuild(version)
-

Powered by Google App Engine
This is Rietveld 408576698