diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 23:20:38 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 23:20:38 +0000 |
| commit | 58cfa44c0acaa816621b49753aba8345ecb8c876 (patch) | |
| tree | 61c3791d72c6205106af176fddbc4d868f40ab0c /webkit/build/JavaScriptCore | |
| parent | 84658a60566f556b4053215439608e1dd07b96fb (diff) | |
| download | chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.zip chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.tar.gz chromium_src-58cfa44c0acaa816621b49753aba8345ecb8c876.tar.bz2 | |
* Get linux building with the merge branch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index ba5cb99..97534f7 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -20,11 +20,17 @@ env.Replace( CREATE_HASH_TABLE_FLAGS = '-i', ) +# TODO(erg): Temporarily disabling JSC building since it's changed heavily +# during the merge; I am also not sure we want/need to build it when building +# V8... +# +# We still need to build the pieces of pcre so we can't just drop this +# SConscript file though... <http://crbug.com/3043> +""" env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM', suffix = '.lut.h', src_suffix = '.cpp') - inputs = [ 'array_object', 'date_object', @@ -39,6 +45,7 @@ for i in inputs: env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table', CREATE_HASH_TABLE_FLAGS='') +""" # TODO(bradnelson): sucks, needs relative path env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c', @@ -68,13 +75,13 @@ copies = [ 'API/JSStringRefCF.h', 'API/JSStringRefBSTR.h', 'API/JavaScriptCore.h', - 'bindings/npruntime.h', - 'bindings/runtime.h', - 'bindings/NP_jsobject.h', - 'bindings/npruntime_internal.h', - 'bindings/npruntime_impl.h', - 'bindings/runtime_object.h', - 'bindings/runtime_root.h', + '../WebCore/bridge/npruntime.h', + '../WebCore/bridge/runtime.h', + '../WebCore/bridge/NP_jsobject.h', + '../WebCore/bridge/npruntime_internal.h', + '../WebCore/bridge/npruntime_impl.h', + '../WebCore/bridge/runtime_object.h', + '../WebCore/bridge/runtime_root.h', 'kjs/collector.h', 'kjs/JSLock.h', 'kjs/interpreter.h', |