diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 22:47:45 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 22:47:45 +0000 |
| commit | b05c90f8107464ca18d888a251cea7dd7c1b0776 (patch) | |
| tree | 829061330ac1f6256e7221272ff33e04830ee0d5 /webkit/build/JSConfig | |
| parent | 5cca3a55b3f1c25c5b3a19c3b42227aae34e4abf (diff) | |
| download | chromium_src-b05c90f8107464ca18d888a251cea7dd7c1b0776.zip chromium_src-b05c90f8107464ca18d888a251cea7dd7c1b0776.tar.gz chromium_src-b05c90f8107464ca18d888a251cea7dd7c1b0776.tar.bz2 | |
Get JSConfig and JavaScriptCore/libWTF.a building under linux.
- Mainly separating out windows options into env['PLATFROM'] sections.
- Fix for case sensitive filesystems.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JSConfig')
| -rw-r--r-- | webkit/build/JSConfig/SConscript | 20 | ||||
| -rwxr-xr-x | webkit/build/JSConfig/create-config.sh | 2 |
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 |