diff options
| -rw-r--r-- | base/base.gyp | 11 | ||||
| -rw-r--r-- | build/SConscript.main | 8 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 73 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 40 |
4 files changed, 118 insertions, 14 deletions
diff --git a/base/base.gyp b/base/base.gyp index 17ca9ce..e647911 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -379,6 +379,8 @@ 'sources': [ 'gfx/gdi_util.cc', 'gfx/gdi_util.h', + 'gfx/gtk_util.cc', + 'gfx/gtk_util.h', 'gfx/jpeg_codec.cc', 'gfx/jpeg_codec.h', 'gfx/native_theme.cc', @@ -415,8 +417,13 @@ ], 'conditions': [ [ 'OS != "win"', { 'sources!': [ - 'gfx/gdi_util.cc', - 'gfx/native_theme.cc' ] + 'gfx/gdi_util.cc', + 'gfx/native_theme.cc', + ], + }], + [ 'OS != "linux"', { 'sources!': [ + 'gfx/gtk_util.cc', + ], }], ], }, 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'): diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index 1770e5b..9f3de86 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -81,7 +81,17 @@ '../../webkit.gyp:webkit', ], 'conditions': [ - ['OS!="linux"', {'sources/': [['exclude', '_gtk\\.cc$']]}], + ['OS=="linux"', { + 'dependencies': [ + 'test_shell_resources', + ], + # for: test_shell_gtk.cc + 'cflags': ['-Wno-multichar'], + }, { # else: OS!=linux + 'sources/': [ + ['exclude', '_gtk\\.cc$'] + ], + }], ['OS=="mac"', { 'sources': [ # Windows/Linux use this code normally when constructing events, so @@ -144,6 +154,32 @@ 'INFOPLIST_FILE': 'mac/Info.plist', }, 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../../../net/net.gyp:net_resources', + '../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak + 'test_shell_resources', + ], + 'actions': [ + { + 'action_name': 'test_shell_repack', + 'inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/test_shell_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak', + ], + 'outputs': [ + '<(PRODUCT_DIR)/test_shell.pak', + ], + 'action': ['python', '../tools/data_pack/repack.py', '<@(_outputs)', '<@(_inputs)'], + }, + ], + 'scons_depends': [ + ['<(PRODUCT_DIR)/test_shell'], + ['<(PRODUCT_DIR)/test_shell.pak'], + ], + }], ['OS=="mac"', { 'product_name': 'TestShell', 'variables': { @@ -235,4 +271,39 @@ ], }, ], + 'conditions': [ + ['OS=="linux"', { + 'targets': [ + { + 'target_name': 'test_shell_resources', + 'type': 'none', + 'sources': [ + 'test_shell_resources.grd', + ], + # This was orignally in grit_resources.rules + # NOTE: this version doesn't mimic the Properties specified there. + 'rules': [ + { + 'rule_name': 'grit', + 'extension': 'grd', + 'inputs': [ + '../../../tools/grit/grit.py', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/grit/<(RULE_INPUT_ROOT).h', + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources/<(RULE_INPUT_ROOT).pak', + ], + 'action': + ['python', '../tools/grit/grit.py', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources'], + }, + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/grit_derived_sources', + ], + }, + }, + ], + }], + ], } diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 98d2dae..a258baa 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -349,6 +349,12 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit', ], }], + ['OS=="linux"', { + 'defines': ['WTF_USE_PTHREADS=1'], + 'direct_dependent_settings': { + 'defines': ['WTF_USE_PTHREADS=1'], + }, + }], ], }, { @@ -1068,8 +1074,8 @@ 'port/bindings/v8/v8_nodefilter.h', 'port/bindings/v8/V8NPUtils.cpp', 'port/bindings/v8/V8NPUtils.h', - 'port/bindings/v8/V8NPobject.cpp', - 'port/bindings/v8/V8NPobject.h', + 'port/bindings/v8/V8NPObject.cpp', + 'port/bindings/v8/V8NPObject.h', 'port/bindings/v8/v8_proxy.cpp', 'port/bindings/v8/v8_proxy.h', 'port/bindings/v8/v8_utility.h', @@ -3175,8 +3181,8 @@ '../third_party/WebKit/WebCore/rendering/RenderTextFragment.h', '../third_party/WebKit/WebCore/rendering/RenderTheme.cpp', '../third_party/WebKit/WebCore/rendering/RenderTheme.h', - '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumGtk.cpp', - '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumGtk.h', + '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.cpp', + '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumLinux.h', '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.h', '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.mm', '../third_party/WebKit/WebCore/rendering/RenderThemeChromiumWin.cpp', @@ -3913,13 +3919,21 @@ # Not yet ported to Linux. '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp', ], - 'defines': ['WTF_USE_PTHREADS=1'], + 'sources/': [ + # Cherry-pick files excluded by the broader regular expressions above. + ['include', 'third_party/WebKit/WebCore/platform/chromium/KeyCodeConversionGtk\\.cpp$'], + ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/FontCacheLinux\\.cpp$'], + ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/FontLinux\\.cpp$'], + ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/FontPlatformDataLinux\\.cpp$'], + ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/GlyphPageTreeNodeLinux\\.cpp$'], + ['include', 'third_party/WebKit/WebCore/platform/graphics/chromium/SimpleFontDataLinux\\.cpp$'], + ], # for: # .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp 'cflags': ['-Wno-multichar'], - # TODO(sgk): unnecessary once common.gypi gets Linux settings - # necessary to avoid build failure due to warnings generated by: - # ../third_party/WebKit/WebCore/dom/Document.cpp + # TODO(sgk): unnecessary once common.gypi gets Linux settings + # necessary to avoid build failure due to warnings generated by: + # ../third_party/WebKit/WebCore/dom/Document.cpp 'scons_remove' : {'CXXFLAGS' : ['-Werror']}, }], ['OS=="mac"', { @@ -4289,6 +4303,8 @@ 'glue/webinputevent.h', 'glue/webinputevent_linux.cc', 'glue/webinputevent_mac.mm', + 'glue/webinputevent_util.cc', + 'glue/webinputevent_util.h', 'glue/webinputevent_win.cc', 'glue/webkit_glue.cc', 'glue/webkit_glue.h', @@ -4338,8 +4354,12 @@ 'webcore', ], 'conditions': [ - ['OS!="linux"', { - 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$']] + ['OS=="linux"', { + 'sources!': [ + 'glue/plugins/plugin_stubs.cc', + ], + }, { # else: OS!="linux" + 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$']], }], ['OS!="mac"', { 'sources/': [['exclude', '_mac\\.(cc|mm)$']] |