From de56f378336660dcc848763c80267a5e063ae47d Mon Sep 17 00:00:00 2001
From: "tc@google.com" <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 1 Oct 2008 22:31:35 +0000
Subject: 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
---
 webkit/build/JavaScriptCore/SConscript | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'webkit/build/JavaScriptCore/SConscript')

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',
         ]
-- 
cgit v1.1