diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/SConscript | 16 | ||||
| -rw-r--r-- | webkit/activex_shim/SConscript | 3 | ||||
| -rw-r--r-- | webkit/activex_shim_dll/SConscript | 3 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 3 | ||||
| -rw-r--r-- | webkit/default_plugin/SConscript | 3 | ||||
| -rw-r--r-- | webkit/glue/plugins/test/SConscript | 15 | ||||
| -rw-r--r-- | webkit/tools/npapi_layout_test_plugin/SConscript | 20 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 63 |
8 files changed, 62 insertions, 64 deletions
diff --git a/webkit/SConscript b/webkit/SConscript index 7e3fc34..e932784 100644 --- a/webkit/SConscript +++ b/webkit/SConscript @@ -81,7 +81,9 @@ env.Prepend( '$ZLIB_DIR', '$LIBPNG_DIR', '$LIBJPEG_DIR', + '$LIBXSLT_DIR/scons', '$LIBXSLT_DIR', + '$LIBXML_DIR/scons/include', '$LIBXML_DIR/include', '$LIBXML_DIR/DerivedSources/include', '$ICU38_DIR/public/common', @@ -91,8 +93,8 @@ env.Prepend( '$SKIA_DIR/platform', '$NPAPI_DIR', '$V8_DIR/include', - '$WEBKIT_DIR/V8Bindings/DerivedSources', - '$WEBKIT_DIR/V8Bindings/SharedSources', + '$DERIVED_DIR', + '$SHARED_DIR', '$WEBKIT_DIR/port/bindings/v8', '$WEBKIT_DIR/WebCore', '$WEBKIT_DIR/WebCore/JavaScriptHeaders', @@ -145,10 +147,13 @@ env.Prepend( '$WEBKIT_DIR/port/svg/animation', '$WEBKIT_DIR/port/svg/graphics/filters', - '#/..', + '$ROOT_DIR', ], ) +if env.Bit('windows'): + env.Append(CPPPATH = ['$WEBKIT_DIR/port/page/win']) + env.Append( WEBCORE_DIR = "$THIRD_PARTY_WEBKIT_DIR/WebCore", PENDING_DIR = "$WEBKIT_DIR/pending", @@ -160,8 +165,8 @@ env.Append( PCRE_DIR = "$JAVASCRIPTCORE_DIR/pcre", V8BINDINGS_DIR = "$WEBKIT_DIR/V8Bindings", - DERIVED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/DerivedSources"), - SHARED_DIR = env.Dir("$WEBKIT_DIR/V8Bindings/SharedSources"), + DERIVED_DIR = "$WEBKIT_DIR/V8Bindings/DerivedSources", + SHARED_DIR = "$WEBKIT_DIR/V8Bindings/SharedSources", # This is a stop gap to get linux building in time for the webkit # merge. The true fix is to move the above CPPPATH prepend under this @@ -281,4 +286,3 @@ version = env.Command('$WEBKIT_DIR/build/WebCore/webkit_version.h', '#/../webkit/build/webkit_version.py'], "$PYTHON ${SOURCES[1]} ${SOURCES[0]} ${TARGET.dir}") env.AlwaysBuild(version) - diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript index cf235e6..bf2c5fc2 100644 --- a/webkit/activex_shim/SConscript +++ b/webkit/activex_shim/SConscript @@ -9,7 +9,7 @@ env = env.Clone() env.Prepend( CPPPATH = [ '$NPAPI_DIR', - '#/..', + '$ROOT_DIR', ], ) @@ -41,4 +41,3 @@ input_files = [ ] env.ChromeStaticLibrary('activex_shim', input_files) - diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript index a4dc1b2..29d4092 100644 --- a/webkit/activex_shim_dll/SConscript +++ b/webkit/activex_shim_dll/SConscript @@ -44,6 +44,5 @@ input_files = [ ] dll = env.ChromeSharedLibrary('npaxshim', input_files) -i = env.Install('$TARGET_ROOT', dll) +i = env.Replicate('$MAIN_DIR/Hammer', dll[0]) env.Alias('webkit', i) - diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index b1e27e2..7a9de8f 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -16,7 +16,6 @@ cygwin_posix = cygwin.abspath.replace('\\', '/') pending = env.Dir('#../webkit/pending') portroot = env.Dir('#../webkit/port') webkit_build = env.Dir('#../webkit/build') -bindings_output_dir = env.Dir('#/../webkit/$BUILD_TYPE/scons/V8Bindings') def PosixIncludes(env, prefix, files, suffix): @@ -477,7 +476,7 @@ idl_files = [ ] for subdir in set([os.path.dirname(n) for n in idl_files]): - dir = env.Dir('#/$BUILD_TYPE/webkit/port/' + subdir) + dir = env.Dir('$OBJ_ROOT/webkit/port/' + subdir) dir.addRepository(env.Dir('#/../webkit/pending')) dir.addRepository(env.Dir('#/../webkit/port/' + subdir)) diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript index 571e64d..2cad465 100644 --- a/webkit/default_plugin/SConscript +++ b/webkit/default_plugin/SConscript @@ -14,6 +14,8 @@ env.Prepend( '#/../third_party/libxml/include', '#/../third_party/npapi', '#/..', +# TODO(bradnelson): this might be needed? +# '$OBJ_ROOT/webkit/build/localized_strings', ], ) @@ -51,4 +53,3 @@ if env['PLATFORM'] == 'win32': ]) env.ChromeStaticLibrary('default_plugin', input_files) - diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript index 3e90365..bfdc821 100644 --- a/webkit/glue/plugins/test/SConscript +++ b/webkit/glue/plugins/test/SConscript @@ -69,18 +69,7 @@ if env['PLATFORM'] == 'win32': ], ) - dll = env.ChromeSharedLibrary([ - 'npapi_test_plugin', - 'npapi_test_plugin.lib', - 'npapi_test_plugin.ilk', - 'npapi_test_plugin.pdb' - ], input_files) +dll = env.ChromeSharedLibrary('npapi_test_plugin', input_files) - # TODO(sgk): goes away once ChromeSharedLibrary does this for us. - env.Install('$LIBS_DIR', dll[1]) -else: - dll = env.ChromeSharedLibrary(['npapi_test_plugin'], input_files) - -i = env.Install('$TARGET_ROOT', dll) +i = env.Replicate('$MAIN_DIR/Hammer', dll[0]) env.Alias('webkit', i) - diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript index 4b2da51..329fb92 100644 --- a/webkit/tools/npapi_layout_test_plugin/SConscript +++ b/webkit/tools/npapi_layout_test_plugin/SConscript @@ -45,23 +45,7 @@ if env['PLATFORM'] == 'win32': ], ) -if env['PLATFORM'] == 'win32': - dll = env.ChromeSharedLibrary([ - 'npapi_layout_test_plugin', - 'npapi_layout_test_plugin.lib', - 'npapi_layout_test_plugin.ilk', - 'npapi_layout_test_plugin.pdb' - ], input_files) - - # TODO(sgk): goes away when env.ChromeSharedLibrary() knows how - # to do this for us. - env.Install('$LIBS_DIR', dll[1]) -else: - dll = env.ChromeSharedLibrary(['npapi_layout_test_plugin'], input_files) + dll = env.ChromeSharedLibrary('npapi_layout_test_plugin', input_files) -i = env.Install('$TARGET_ROOT/plugins', dll) +i = env.Install('$MAIN_DIR/Hammer', dll[0]) env.Alias('webkit', i) - -i = env.Install('$TARGET_ROOT', dll) -env.Alias('webkit', i) - diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 1fd70e631..03d5c3f 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -25,6 +25,7 @@ env.Append( '$WEBKIT_DIR/glue', '$GTEST_DIR/include', ], + LIBPATH = ['$V8_DIR'], LIBS = [ 'test_shell', 'glue', @@ -92,12 +93,16 @@ elif env['PLATFORM'] in ('posix', 'darwin'): ] ) -input_files = [ +common_objs = [env.ChromeObject(i) for i in [ 'test_navigation_controller.cc', 'test_shell_switches.cc', +]] + + +input_files = [ + common_objs, ] if env['PLATFORM'] == 'win32': - # TODO(port): put portable files in above test_files declaration. input_files.extend([ 'drag_delegate.cc', 'drop_delegate.cc', @@ -128,13 +133,13 @@ if env['PLATFORM'] == 'win32': # TODO(port): figure out what to do with resources. resources = [ env_res.RES('resources/test_shell.rc'), - '$NET_DIR/net_resources.res', + '$OBJ_ROOT/net/net_resources.res', '$WEBKIT_DIR/build/localized_strings/webkit_strings_en-US.res', ] exe_input_files = [ 'test_shell_main.cc', - '$V8_DIR/snapshot-empty$OBJSUFFIX' + '$V8_DIR/obj/release/snapshot-empty$OBJSUFFIX' ] elif env['PLATFORM'] == 'posix': exe_input_files = [ @@ -150,33 +155,52 @@ if env['PLATFORM'] == 'win32': env.Depends(test_shell, '$V8_DIR/vc80.pdb') test_files = [ - 'run_all_tests.cc', + common_objs, + 'image_decoder_unittest.cc', + 'keyboard_unittest.cc', + 'layout_test_controller_unittest.cc', + 'node_leak_test.cc', + 'plugin_tests.cc', + 'run_all_tests.cc', + 'test_shell_test.cc', + 'text_input_controller_unittest.cc', + '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', + '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', + '$WEBKIT_DIR/glue/context_menu_unittest.cc', + '$WEBKIT_DIR/glue/cpp_bound_class_unittest.cc', + '$WEBKIT_DIR/glue/cpp_variant_unittest.cc', + '$WEBKIT_DIR/glue/dom_operations_unittest.cc', + '$WEBKIT_DIR/glue/dom_serializer_unittest.cc', + '$WEBKIT_DIR/glue/glue_serialize_unittest.cc', + '$WEBKIT_DIR/glue/iframe_redirect_unittest.cc', + '$WEBKIT_DIR/glue/mimetype_unittest.cc', + '$WEBKIT_DIR/glue/multipart_response_delegate_unittest.cc', + '$WEBKIT_DIR/glue/password_autocomplete_listener_unittest.cc', + '$WEBKIT_DIR/glue/regular_expression_unittest.cc', + '$WEBKIT_DIR/glue/resource_fetcher_unittest.cc', + # Commented out until a regression is fixed and this file is restored. + #'$WEBKIT_DIR/glue/stringimpl_unittest.cc', + '$WEBKIT_DIR/glue/webframe_unittest.cc', + '$WEBKIT_DIR/glue/webplugin_impl_unittest.cc', + '$WEBKIT_DIR/port/platform/GKURL_unittest.cpp', + '$WEBKIT_DIR/port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp', + '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp', + '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp', + + '$V8_DIR/obj/release/snapshot-empty$OBJSUFFIX', ] if env['PLATFORM'] == 'win32': # TODO(port): put portable files in above test_files declaration. test_files.extend([ - 'drag_delegate.cc', - 'drop_delegate.cc', - 'event_sending_controller.cc', 'image_decoder_unittest.cc', 'keyboard_unittest.cc', - 'layout_test_controller.cc', 'layout_test_controller_unittest.cc', 'node_leak_test.cc', 'plugin_tests.cc', 'run_all_tests.cc', - 'simple_resource_loader_bridge.cc', - 'test_navigation_controller.cc', - 'test_shell.cc', - 'test_shell_request_context.cc', - 'test_shell_switches.cc', 'test_shell_test.cc', - 'test_webview_delegate.cc', - 'text_input_controller.cc', 'text_input_controller_unittest.cc', - 'webview_host.cc', - 'webwidget_host.cc', '$WEBKIT_DIR/glue/autocomplete_input_listener_unittest.cc', '$WEBKIT_DIR/glue/bookmarklet_unittest.cc', '$WEBKIT_DIR/glue/context_menu_unittest.cc', @@ -200,11 +224,10 @@ if env['PLATFORM'] == 'win32': '$WEBKIT_DIR/port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp', '$WEBKIT_DIR/port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp', - '$V8_DIR/snapshot-empty$OBJSUFFIX', + '$V8_DIR/obj/release/snapshot-empty$OBJSUFFIX' ]) test_shell_tests = env.ChromeTestProgram('test_shell_tests', resources + test_files) i = env.Install('$TARGET_ROOT', test_shell_tests) env.Alias('webkit', i) - |