diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 21:33:46 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-06 21:33:46 +0000 |
| commit | 40c3f52941c7aeb960fda325c952874951eadf7d (patch) | |
| tree | 4c423a17fc25e4410ac5615411b27e1eb12e36b0 /build | |
| parent | dc7588ee74d08438c6475cc0202516a7f2a51b0e (diff) | |
| download | chromium_src-40c3f52941c7aeb960fda325c952874951eadf7d.zip chromium_src-40c3f52941c7aeb960fda325c952874951eadf7d.tar.gz chromium_src-40c3f52941c7aeb960fda325c952874951eadf7d.tar.bz2 | |
Build test_shell and test_shell_tests on Linux from gyp-generated scons files:
* Catch up to recent changes:
* Rename RenderThemeChromiumGtk.cpp to RenderThemeChromiumLinux.cpp.
* Fix spelling of V*NPObject.{cpp,h}
* Explicitly include varions WebCore *Gtk.cpp and *Linux.cpp files that
are excluded by the general regular expression.
* Add webinput_event_util.cc.
* Exclude glue/plugins/plugin_stubs.cc.
* Add a Linux test_shell_resources target to build
test_shell_resources.{h,pak}.
* Add an explicit test_shell action to repack resources into test_shell.pak.
* Use -Wno-multichar when building libtest_shell_common.a.
* Use -DWTF_USE_PTHREADS when building libwtf.a, and when dependent
targets compile against it.
* Use tools/test_shell/test_shell_main{,_GYP}.scons as the main
entry point for GYP-based builds of webkit.
* Add base/gfx/gtk_util.cc to the base build.
Review URL: http://codereview.chromium.org/39219
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 97b6701..4289b43d 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -189,6 +189,12 @@ components = [] # Default is to load all SConscript files for a full-tree build. # The keyword arguments in the call below (base, breakpad, etc.) can be # specified in the LOAD= argument to cut down on the build. + +if root_env.get('_GYP'): + webkit_sconscript = '$WEBKIT_DIR/tools/test_shell/test_shell_main${_GYP}.scons' +else: + webkit_sconscript = '$WEBKIT_DIR/webkit_main${_GYP}.scons' + sconscript_map = dict( base = '$BASE_DIR/base_main${_GYP}.scons', breakpad = '$BREAKPAD_DIR/SConscript', @@ -219,7 +225,7 @@ sconscript_map = dict( ], tools = '$GTK_CLIP_DUMP_DIR/gcd.scons', v8 = '$OBJ_ROOT/build/SConscript.v8', - webkit = '$WEBKIT_DIR/webkit_main${_GYP}.scons', + webkit = webkit_sconscript, ) if root_env.get('_GYP'): |