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/JSConfig | |
| 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/JSConfig')
| -rwxr-xr-x | webkit/build/JSConfig/create-config.sh | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/webkit/build/JSConfig/create-config.sh b/webkit/build/JSConfig/create-config.sh index e79d2a1..49b7d21 100755 --- a/webkit/build/JSConfig/create-config.sh +++ b/webkit/build/JSConfig/create-config.sh @@ -70,6 +70,7 @@ rm -f "${WebCoreObjDir}/definitions.h" JSHeadersDir="${JSHeadersDir}${SubDir}" mkdir -p $JSHeadersDir JavaScriptCoreSrcDir="../../../third_party/WebKit/JavaScriptCore" +WebCoreSrcDir="../../../third_party/WebKit/WebCore" if [[ "$2" = "kjs" ]] then mkdir -p $JSHeadersDir/JavaScriptCore @@ -84,21 +85,21 @@ then $CP $JavaScriptCoreSrcDir/API/JSContextRef.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/API/JSStringRef.h $JSHeadersDir/JavaScriptCore - $CP $JavaScriptCoreSrcDir/bindings/npapi.h $JSHeadersDir - $CP $JavaScriptCoreSrcDir/bindings/npruntime.h $JSHeadersDir - $CP $JavaScriptCoreSrcDir/bindings/npruntime_internal.h $JSHeadersDir - $CP $JavaScriptCoreSrcDir/bindings/npruntime_impl.h $JSHeadersDir - $CP $JavaScriptCoreSrcDir/bindings/npruntime_priv.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npapi.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npruntime.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npruntime_internal.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npruntime_impl.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npruntime_priv.h $JSHeadersDir - $CP $JavaScriptCoreSrcDir/bindings/runtime.h $JSHeadersDir/JavaScriptCore - $CP $JavaScriptCoreSrcDir/bindings/NP_jsobject.h $JSHeadersDir/JavaScriptCore - $CP $JavaScriptCoreSrcDir/bindings/runtime_object.h $JSHeadersDir/JavaScriptCore - $CP $JavaScriptCoreSrcDir/bindings/runtime_root.h $JSHeadersDir/JavaScriptCore + $CP $WebCoreSrcDir/bridge/runtime.h $JSHeadersDir/JavaScriptCore + $CP $WebCoreSrcDir/bridge/np_jsobject.h $JSHeadersDir/JavaScriptCore + $CP $WebCoreSrcDir/bridge/runtime_object.h $JSHeadersDir/JavaScriptCore + $CP $WebCoreSrcDir/bridge/runtime_root.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/kjs/JSImmediate.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/kjs/JSLock.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/kjs/JSType.h $JSHeadersDir/JavaScriptCore - $CP ../../../webkit/pending/kjs/collector.h $JSHeadersDir/JavaScriptCore + $CP $JavaScriptCoreSrcDir/kjs/collector.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/kjs/interpreter.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/kjs/protect.h $JSHeadersDir/JavaScriptCore $CP $JavaScriptCoreSrcDir/kjs/ustring.h $JSHeadersDir/JavaScriptCore @@ -106,8 +107,8 @@ then $CP $JavaScriptCoreSrcDir/wtf/HashCountedSet.h $JSHeadersDir/JavaScriptCore else - $CP $JavaScriptCoreSrcDir/bindings/npapi.h $JSHeadersDir - $CP $JavaScriptCoreSrcDir/bindings/npruntime.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npapi.h $JSHeadersDir + $CP $WebCoreSrcDir/bridge/npruntime.h $JSHeadersDir $CP ../../../webkit/port/bindings/v8/npruntime_priv.h $JSHeadersDir fi |