summaryrefslogtreecommitdiffstats
path: root/webkit/build/JSConfig
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/build/JSConfig')
-rw-r--r--webkit/build/JSConfig/SConscript20
-rwxr-xr-xwebkit/build/JSConfig/create-config.sh2
2 files changed, 15 insertions, 7 deletions
diff --git a/webkit/build/JSConfig/SConscript b/webkit/build/JSConfig/SConscript
index e3a15cf..7e896af 100644
--- a/webkit/build/JSConfig/SConscript
+++ b/webkit/build/JSConfig/SConscript
@@ -31,9 +31,17 @@ Import('env')
env = env.Clone()
-# TODO(bradnelson): very bad, calls batch, calls sh, deps all wrong
-env.Append(ENV = {"OS" : "Windows_NT"})
-env.Command("obj/WebCore/config.h",
- ["prebuild.bat", "../../config.h.in"],
- "cd ${SOURCE.dir} && ${SOURCE.file} ${JSCONFIG_DIR.abspath} v8",
- JSCONFIG_DIR = env.Dir('$WEBKIT_DIR/build/JSConfig'))
+
+if env['PLATFORM'] == 'posix':
+ # TODO(erg): adding to the badness.
+ env.Command("obj/WebCore/config.h",
+ ["create-config.sh", "../../config.h.in"],
+ "cd ${SOURCE.dir} && /bin/bash -x ${SOURCE.file} ${JSCONFIG_DIR.abspath} v8",
+ JSCONFIG_DIR = env.Dir('$WEBKIT_DIR/build/JSConfig'))
+else:
+ # TODO(bradnelson): very bad, calls batch, calls sh, deps all wrong
+ env.Append(ENV = {"OS" : "Windows_NT"})
+ env.Command("obj/WebCore/config.h",
+ ["prebuild.bat", "../../config.h.in"],
+ "cd ${SOURCE.dir} && ${SOURCE.file} ${JSCONFIG_DIR.abspath} v8",
+ JSCONFIG_DIR = env.Dir('$WEBKIT_DIR/build/JSConfig'))
diff --git a/webkit/build/JSConfig/create-config.sh b/webkit/build/JSConfig/create-config.sh
index 4d07f35..e79d2a1 100755
--- a/webkit/build/JSConfig/create-config.sh
+++ b/webkit/build/JSConfig/create-config.sh
@@ -91,7 +91,7 @@ then
$CP $JavaScriptCoreSrcDir/bindings/npruntime_priv.h $JSHeadersDir
$CP $JavaScriptCoreSrcDir/bindings/runtime.h $JSHeadersDir/JavaScriptCore
- $CP $JavaScriptCoreSrcDir/bindings/np_jsobject.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