diff options
| author | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 17:27:52 +0000 |
|---|---|---|
| committer | pinkerton@google.com <pinkerton@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 17:27:52 +0000 |
| commit | 2774db88fd49010757623e9e1a5bd3d1d0cc9372 (patch) | |
| tree | 9a5764f4f504784d71f6f668f0d41073d3750243 /webkit/build/JSConfig | |
| parent | ccfc1a7b70073eac2d1cf0ec4700e0fae725ea02 (diff) | |
| download | chromium_src-2774db88fd49010757623e9e1a5bd3d1d0cc9372.zip chromium_src-2774db88fd49010757623e9e1a5bd3d1d0cc9372.tar.gz chromium_src-2774db88fd49010757623e9e1a5bd3d1d0cc9372.tar.bz2 | |
bootstrap v8 js binding/header generation and putting them in a subdir so switching between kjs and v8 doesn't intermingle headers. Also fix v8 codegen to not have ">>" in templates, which gcc doesn't allow.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build/JSConfig')
| -rwxr-xr-x | webkit/build/JSConfig/create-config.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/webkit/build/JSConfig/create-config.sh b/webkit/build/JSConfig/create-config.sh index 7f6759e..4d07f35 100755 --- a/webkit/build/JSConfig/create-config.sh +++ b/webkit/build/JSConfig/create-config.sh @@ -31,31 +31,43 @@ rm -f $WebCoreObjDir/definitions.h 2> /dev/null if [[ "$2" = "kjs" ]] then + SubDir=/kjs cat > $WebCoreObjDir/definitions.h << -=EOF=- #define WTF_USE_JAVASCRIPTCORE_BINDINGS 1 #define WTF_USE_NPOBJECT 1 -=EOF=- else + SubDir=/v8 cat > $WebCoreObjDir/definitions.h << -=EOF=- #define WTF_USE_V8_BINDING 1 #define WTF_USE_NPOBJECT 1 -=EOF=- fi +if [[ "${OS}" = "Windows_NT" ]] +then + SubDir= +fi + +mkdir -p "${WebCoreObjDir}${SubDir}" + pwd -cat ../../config.h.in $WebCoreObjDir/definitions.h > $WebCoreObjDir/config.h.new +cat ../../config.h.in $WebCoreObjDir/definitions.h > $WebCoreObjDir$SubDir/config.h.new if [[ "${OS}" = "Windows_NT" ]] || \ - ! diff -q $WebCoreObjDir/config.h.new $WebCoreObjDir/config.h >& /dev/null + ! diff -q $WebCoreObjDir$SubDir/config.h.new $WebCoreObjDir$SubDir/config.h >& /dev/null then - mv $WebCoreObjDir/config.h.new $WebCoreObjDir/config.h + mv $WebCoreObjDir$SubDir/config.h.new $WebCoreObjDir$SubDir/config.h else - rm $WebCoreObjDir/config.h.new + rm $WebCoreObjDir$SubDir/config.h.new fi +rm -f "${WebCoreObjDir}/definitions.h" + # # Step 2: Populate the JavaScriptHeaders based on the selected # JavaScript engine. # +JSHeadersDir="${JSHeadersDir}${SubDir}" mkdir -p $JSHeadersDir JavaScriptCoreSrcDir="../../../third_party/WebKit/JavaScriptCore" if [[ "$2" = "kjs" ]] |