diff options
| author | sgk@chromium.org <sgk@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-25 00:59:19 +0000 |
|---|---|---|
| committer | sgk@chromium.org <sgk@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2009-02-25 00:59:19 +0000 |
| commit | e693f0214a9a42e163db751e8dd98d1b1c4d70b9 (patch) | |
| tree | c8dda5433ebe75c8a92d845614f6ea7c7616e436 /samples | |
| parent | ab3a0dd015f24e07c3f91ba1f28cfee4d27baaec (diff) | |
| download | gyp-e693f0214a9a42e163db751e8dd98d1b1c4d70b9.tar.gz | |
Get webkit building (almost) on Linux with gyp-generated *.scons files:
Generator changes:
* Add SCons-appropriate RULE_INPUT_* variable settings.
* Add generation of code to support gyp rules declarations.
(All in-line, pretty grungy, needs cleaning up, but it works.)
* Cleaner code for generating actions and rules sections from
in-line templates.
* Remove some unnecessary imports from the generator.
samples/*.gyp changes:
* Add 'ext' to the dependent 'include_dirs' for skia. Some of the
Linux modules need this to find GdkSkia.h.
* Escape quotes around the WEBCORE_NAVIGATOR_PLATFORM value.
(Might be better handled in the generator.)
* Exclude FontCustomPlatformData.cpp, not yet ported to Linux.
* Remove /grit from the grit.py action and the corresponding
include_dirs entry, so it corresponds to the output file.
(grit.py apparently adds its own grit/ subdirectory.)
Down to two files that don't compile.
git-svn-id: http://gyp.googlecode.com/svn/trunk@303 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/skia.gyp | 1 | ||||
| -rw-r--r-- | samples/webkit.gyp | 12 |
2 files changed, 10 insertions, 3 deletions
diff --git a/samples/skia.gyp b/samples/skia.gyp index afb0b14b..d0a3aaaf 100644 --- a/samples/skia.gyp +++ b/samples/skia.gyp @@ -708,6 +708,7 @@ 'include_dirs': [ 'include', 'include/corecg', + 'ext', ], }, }, diff --git a/samples/webkit.gyp b/samples/webkit.gyp index 3ad13c53..2dbaef26 100644 --- a/samples/webkit.gyp +++ b/samples/webkit.gyp @@ -67,7 +67,7 @@ # 32-bit x86 code on an x86_64 processor, it uses # "Linux i686 (x86_64)". Matching that would require making a # run-time determination. - 'WEBCORE_NAVIGATOR_PLATFORM="Linux i686"', + 'WEBCORE_NAVIGATOR_PLATFORM=\\"Linux i686\\"', ], }], ['OS=="mac"', { @@ -3879,6 +3879,12 @@ 'GCC_PREFIX_HEADER': '../third_party/WebKit/WebCore/WebCorePrefix.h', }, 'conditions': [ + ['OS=="linux"', { + 'sources!': [ + # Not yet ported to Linux. + '../third_party/WebKit/WebCore/platform/graphics/chromium/FontCustomPlatformData.cpp', + ], + }], ['OS=="mac"', { 'actions': [ { @@ -4018,12 +4024,12 @@ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h', ], - 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit/grit'], + 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'], }, ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', - '<(SHARED_INTERMEDIATE_DIR)/webkit/grit', + '<(SHARED_INTERMEDIATE_DIR)/webkit', ], 'sources': [ # webkit_version rule |