diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-01 22:31:35 +0000 |
| commit | de56f378336660dcc848763c80267a5e063ae47d (patch) | |
| tree | 7f551b88923b35bc4022ce6ab3a3f602fb60d91c /webkit/build/JavaScriptCore/SConscript | |
| parent | dc4f63c80cb90efe594131030aad6776e5945fcc (diff) | |
| download | chromium_src-de56f378336660dcc848763c80267a5e063ae47d.zip chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.gz chromium_src-de56f378336660dcc848763c80267a5e063ae47d.tar.bz2 | |
Merge the chrome_webkit_merge_branch back on to trunk. This brings us
up to webkit@36102.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JavaScriptCore/SConscript')
| -rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 3c4c36c..ba5cb99 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -57,6 +57,35 @@ cpp = env.Command(['grammar.cpp', 'grammar.h'], YACCFLAGS = '-d -p kjsyy') env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/grammar.hpp')) +copies = [ + 'API/APICast.h', + 'API/JSBase.h', + 'API/JSValueRef.h', + 'API/JSObjectRef.h', + 'API/JSRetainPtr.h', + 'API/JSContextRef.h', + 'API/JSStringRef.h', + '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', + 'kjs/collector.h', + 'kjs/JSLock.h', + 'kjs/interpreter.h', + 'wtf/HashCountedSet.h', +] + +JSCORE_OUT = '$WEBKIT_DIR/scons/WebCore/JavaScriptCore' + +for c in copies: + i = env.Install(JSCORE_OUT, '$JAVASCRIPTCORE_DIR/' + c) + env.Alias('webkit', i) # Stuff for WTF env = env.Clone( @@ -79,7 +108,6 @@ env = env.Clone( env.Append( CPPDEFINES = [ - 'HAVE_CONFIG_H', '__STD_C', 'U_STATIC_IMPLEMENTATION', ] |