diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 19:09:38 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 19:09:38 +0000 |
| commit | 8e692f0983e37d88fd30e93a0b330404b7cdabb1 (patch) | |
| tree | 1382cb88db9dbb00dabb2fcb4e142b682f68fc84 /webkit | |
| parent | d1684f8ace9dffcb60ad5284456e8b957e0b6598 (diff) | |
| download | chromium_src-8e692f0983e37d88fd30e93a0b330404b7cdabb1.zip chromium_src-8e692f0983e37d88fd30e93a0b330404b7cdabb1.tar.gz chromium_src-8e692f0983e37d88fd30e93a0b330404b7cdabb1.tar.bz2 | |
Fix SCons build following r2490
Review URL: http://codereview.chromium.org/4225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/port/SConscript | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 1d33cb3..aa78b11 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -7,7 +7,7 @@ import re Import('env') -webcore = env.Dir('$WEBKIT_DIR/WebCore') +webcore = env.Dir('#../third_party/WebKit/WebCore') webcore_posix = webcore.abspath.replace('\\', '/') cygwin = env.Dir('$CYGWIN_DIR/bin') @@ -21,6 +21,7 @@ bindings_output_dir = env.Dir('#/../webkit/$BUILD_TYPE/scons/V8Bindings') env = env.Clone( WEBCORE = webcore, + PENDING = pending, PORTROOT = portroot, WEBKIT_BUILD = webkit_build, @@ -51,12 +52,17 @@ env = env.Clone( ], BINDINGS_INCLUDE_PATH = [ + '$PENDING', + '$PORTROOT/dom', + '$PORTROOT/html', + '$PORTROOT/page', + '$PORTROOT/xml', + '$WEBCORE/svg', '$WEBCORE/dom', '$WEBCORE/html', '$WEBCORE/css', '$WEBCORE/page', '$WEBCORE/xml', - '$WEBCORE/svg', ], BINDINGS_INCLUDE_FLAG = '--include ', BINDINGS_INCLUDE_SUFFIX = '', @@ -98,12 +104,9 @@ env.Append( ) env.Replace( - # TODO(bradnelson): don't have the path change here!!! # TODO(bradnelson): fix ugly hack with one include! BINDINGSCOM = '$PERL $_PERL_INCLUDE_FLAGS ' + \ '${SOURCES[1]} ' + \ - '--include ../webkit/port/dom ' + \ - '--include ../third_party/WebKit/WebCore/svg ' + \ '--defines "$FEATURE_DEFINES $BINDINGS_LANGUAGE" ' + \ '--generator $BINDINGS_GENERATOR_ARG ' + \ '$_BINDINGS_INCLUDE_FLAGS ' + \ @@ -126,12 +129,6 @@ elif True: env['BINDINGS_GENERATOR_ARG'] = 'V8' env['BINDINGS_LANGUAGE'] = 'LANGUAGE_JAVASCRIPT V8_BINDING' env.Prepend(PERL_INCLUDE_PATH = [ '$PORTROOT/bindings/scripts' ]) - env.Prepend(BINDINGS_INCLUDE_PATH = [ - '$PORTROOT/dom', - '$PORTROOT/html', - '$PORTROOT/page', - '$PORTROOT/xml', - ]) else: print 'I am not going to generate bindings for you!' |