summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/build/JSConfig/create-config.sh25
-rw-r--r--webkit/build/JavaScriptCore/copy_files.bat12
2 files changed, 13 insertions, 24 deletions
diff --git a/webkit/build/JSConfig/create-config.sh b/webkit/build/JSConfig/create-config.sh
index 0866fd4..228a14d 100755
--- a/webkit/build/JSConfig/create-config.sh
+++ b/webkit/build/JSConfig/create-config.sh
@@ -74,28 +74,19 @@ WebCoreSrcDir="../../../third_party/WebKit/WebCore"
if [[ "$2" = "kjs" ]]
then
mkdir -p $JSHeadersDir/JavaScriptCore
- # Note, we'd like to copy dir/*.h here, but the directories
- # are poluted with files like Node.h. Copying the Node.h
- # from these directories is fatal. So, we have to hand copy just
- # the right list of files. Hooray!
$CP $JavaScriptCoreSrcDir/API/APICast.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JavaScript.h $JSHeadersDir/JavaScriptCore
$CP $JavaScriptCoreSrcDir/API/JSBase.h $JSHeadersDir/JavaScriptCore
- $CP $JavaScriptCoreSrcDir/API/JSValueRef.h $JSHeadersDir/JavaScriptCore
- $CP $JavaScriptCoreSrcDir/API/JSObjectRef.h $JSHeadersDir/JavaScriptCore
$CP $JavaScriptCoreSrcDir/API/JSContextRef.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JSObjectRef.h $JSHeadersDir/JavaScriptCore
$CP $JavaScriptCoreSrcDir/API/JSStringRef.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JSStringRefCF.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JSStringRefBSTR.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JSValueRef.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JavaScriptCore.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/JSRetainPtr.h $JSHeadersDir/JavaScriptCore
+ $CP $JavaScriptCoreSrcDir/API/OpaqueJSString.h $JSHeadersDir/JavaScriptCore
$CP $JavaScriptCoreSrcDir/API/WebKitAvailability.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 $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
- $CP $JavaScriptCoreSrcDir/kjs/JSValue.h $JSHeadersDir/JavaScriptCore
-
- $CP $JavaScriptCoreSrcDir/wtf/HashCountedSet.h $JSHeadersDir/JavaScriptCore
else
$CP $WebCoreSrcDir/bridge/npapi.h $JSHeadersDir
$CP $WebCoreSrcDir/bridge/npruntime.h $JSHeadersDir
diff --git a/webkit/build/JavaScriptCore/copy_files.bat b/webkit/build/JavaScriptCore/copy_files.bat
index c01e0b7..431032b 100644
--- a/webkit/build/JavaScriptCore/copy_files.bat
+++ b/webkit/build/JavaScriptCore/copy_files.bat
@@ -6,19 +6,17 @@ setlocal
mkDIR 2>NUL %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\APICast.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JavaScript.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSBase.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSValueRef.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSObjectRef.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSRetainPtr.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSContextRef.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSObjectRef.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRef.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRefCF.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRefBSTR.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSValueRef.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JavaScriptCore.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSRetainPtr.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\OpaqueJSString.h" %DIR%
xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\WebKitAvailability.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\JSLock.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\collector.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\interpreter.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\wtf\HashCountedSet.h" %DIR%
endlocal