From 9d384037786ac2912d2ffc82cd1718d8383d8d9f Mon Sep 17 00:00:00 2001 From: "sgk@google.com" Date: Fri, 20 Mar 2009 23:13:26 +0000 Subject: Update the gyp Linux build: * Add Linux settings to target_defaults in common.gypi so gyp-generated SConscript files no longer depend on build/SConscript.main or the Hammer infrastructure. * Copy the FilterOut() function from Hammer to the chromium_builders.py Tool module. * Add a ChromiumLoadableModule() builder to chromium_builders.py. * Add dependencies on the 'views' library to the chrome link (target 'app'). * Add missing views/*/*_unittest.cc modules to the 'unit_tests' target. Exclude all but the one that builds on Linux from the non-Windows builds. * Crib a list of chrome/views files to exclude from the Linux build from the old SCons configuration. * Add a new build/linux/system.gyp file with new 'settings' targets to encapsulate the pkg-config checks for gtk+-2.0, nss and pangoft2. * Add depenedencies in the other targets on the new gtk, nss and pangoft2 'settings' targets from build/linux/system.gyp. * Add a pkg_config_wrapper.py script that keeps gyp happy by simply exiting 0 if the package isn't found. * DEPS roll for latest gyp changes to support the above. Review URL: http://codereview.chromium.org/42340 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12228 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/webkit.gyp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'webkit/webkit.gyp') diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 0415266..c91e6fd 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -3942,6 +3942,9 @@ }, 'conditions': [ ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], 'sources!': [ # Not yet ported to Linux. '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp', @@ -3955,9 +3958,11 @@ ['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'], + 'cflags': [ + # -Wno-multichar for: + # .../WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp + '-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 @@ -4119,6 +4124,11 @@ '../third_party/WebKit/WebKit/chromium/src/WebURL.cpp', ], 'conditions': [ + ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], + }], ['OS=="mac"', { 'sources!': [ '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp', @@ -4411,6 +4421,10 @@ ], 'conditions': [ ['OS=="linux"', { + 'dependencies': [ + '../build/linux/system.gyp:gtk', + '../build/linux/system.gyp:pangoft2', + ], 'sources!': [ 'glue/plugins/plugin_stubs.cc', ], -- cgit v1.1