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

4 files changed, 72 insertions, 52 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
 
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index c00c092..6608ebe 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -41,7 +41,7 @@ hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $T
 
 env.Replace(
     CREATE_HASH_TABLE_COM       = hash_table_cmd,
-    CREATE_HASH_TABLE           = env.File('#/../third_party/WebKit/JavascriptCore/kjs/create_hash_table'),
+    CREATE_HASH_TABLE           = env.File('#/../third_party/WebKit/JavaScriptCore/kjs/create_hash_table'),
     CREATE_HASH_TABLE_FLAGS     = '-i',
 )
 
@@ -95,7 +95,7 @@ copies = [
     'API/JavaScriptCore.h',
     'bindings/npruntime.h',
     'bindings/runtime.h',
-    'bindings/np_jsobject.h',
+    'bindings/NP_jsobject.h',
     'bindings/npruntime_internal.h',
     'bindings/npruntime_impl.h',
     'bindings/runtime_object.h',
@@ -118,9 +118,7 @@ env.Alias('webkit', i)
 # Stuff for WTF
 env = env.Clone(
     CPPPATH = [
-        '$WEBKIT_DIR/build/JavaScriptCore',
         '$JAVASCRIPTCORE_DIR',
-        '$JAVASCRIPTCORE_DIR/os-win32',
         '$JAVASCRIPTCORE_DIR/kjs',
         '$WTF_DIR',
         '$JAVASCRIPTCORE_DIR/API',
@@ -140,25 +138,37 @@ env.Append(
     CPPDEFINES = [
         'HAVE_CONFIG_H',
         '__STD_C',
-        'CRASH=__debugbreak',
         'U_STATIC_IMPLEMENTATION',
-        '_WIN32_WINNT=0x0600',
-        'WINVER=0x0600',
-    ],
-    CCFLAGS = [
-        '/TP',
-
-        '/WX',
-        '/Wp64',
-
-        '/wd4127',
-        '/wd4355',
-        '/wd4510',
-        '/wd4512',
-        '/wd4610',
-        '/wd4706',
-    ],
-)
+        ]
+    )
+
+if env['PLATFORM'] == 'win32':
+    env.Append(
+        CPPPATH = [
+                # Windows workarounds to not having pthread.h and sched.h
+                '$WEBKIT_DIR/build/JavaScriptCore',
+                # Windows workarounds to not having stdint.h
+                '$JAVASCRIPTCORE_DIR/os-win32',
+                ],
+        CPPDEFINES = [
+                'CRASH=__debugbreak',
+                '_WIN32_WINNT=0x0600',
+                'WINVER=0x0600',
+                ],
+        CCFLAGS = [
+                '/TP',
+
+                '/WX',
+                '/Wp64',
+
+                '/wd4127',
+                '/wd4355',
+                '/wd4510',
+                '/wd4512',
+                '/wd4610',
+                '/wd4706',
+                ],
+        )
 
 wtf_inputs = [
     '$WTF_DIR/Assertions.cpp',
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index a421e6b..ab7a703 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -31,28 +31,20 @@ Import('env')
 
 env = env.Clone()
 
-env.Append(
-    CCFLAGS = [
-        '/TP',
-
-        '/wd4138',
-        '/wd4244',
-        '/wd4291',
-        '/wd4305',
-        '/wd4521',
-        '/wd4099',
-        '/wd4800',
-    ],
-)
-
-
-env_p = env.Clone()
-env_p.Append(CCFLAGS='/Ylwebcore')
-pch, obj = env_p.PCH('../precompiled_webkit.cc')
-env['PCH'] = pch
-env['PCHSTOP'] = 'precompiled_webkit.h'
-env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
-
+if env['PLATFORM'] == 'win32':
+    env.Append(
+        CCFLAGS = [
+                '/TP',
+                
+                '/wd4138',
+                '/wd4244',
+                '/wd4291',
+                '/wd4305',
+                '/wd4521',
+                '/wd4099',
+                '/wd4800',
+                ],
+        )
 
 input_files = [
     '$PENDING_DIR/JSSVGLazyEventListener.cpp',
@@ -699,4 +691,14 @@ input_files = [
     '$WEBCORE_DIR/xml/XSLTUnicodeSort.cpp',
 ]
 
-env.ChromeStaticLibrary('WebCore', input_files + [obj])
+# Precompiled headers only work under MSVC in scons.
+if env['PLATFORM'] == 'win32':
+    env_p = env.Clone()
+    env_p.Append(CCFLAGS='/Ylwebcore')
+    pch, obj = env_p.PCH('../precompiled_webkit.cc')
+    env['PCH'] = pch
+    env['PCHSTOP'] = 'precompiled_webkit.h'
+    env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h'])
+    input_files += [obj]
+
+env.ChromeStaticLibrary('WebCore', input_files)