Some small linux build cleanups:

- Move WTF_USE_ICU_UNICODE from config.h.in to our SConscript file
- Fix the include path for libxml/xmlversion.h (use the file copied
  into Hammer rather than the one from the linux subdir)
- Make precompiled_v8bindings.cpp be conditionally added, rather than
  conditionally removed.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3142 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 23 deletions

diff --git a/third_party/libxml/SConscript b/third_party/libxml/SConscript
index 3a0c00a..6533abd 100644
--- a/third_party/libxml/SConscript
+++ b/third_party/libxml/SConscript
@@ -154,4 +154,3 @@ elif env['PLATFORM'] == 'posix':
   for cf in config_files:
     result = env.Command('scons/' + cf, 'linux/' + cf,
                          Copy('$TARGET', '$SOURCE'))
-
diff --git a/webkit/SConscript b/webkit/SConscript
index 084fc73..54b6cce 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -48,6 +48,9 @@ elif env['PLATFORM'] == 'posix':
       ],
       CPPDEFINES = [
         'BUILDING_GTK__',
+        # In Platform.h, this doesn't get defined when BUILDING_GTK__ is
+        # defined.
+        'WTF_USE_ICU_UNICODE',
       ],
   )
 
@@ -78,6 +81,7 @@ env.Prepend(
         '$LIBJPEG_DIR',
         '$LIBXSLT_DIR',
         '$LIBXML_DIR/include',
+        '$LIBXML_DIR/scons/include',
         '$ICU38_DIR/public/common',
         '$ICU38_DIR/public/i18n',
         '$SKIA_DIR/include',
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 5515529..4fd0481 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -123,13 +123,6 @@ env.Append(
     ],
 )
 
-if env['PLATFORM'] == 'posix':
-    env.Append(
-        CPPDEFINES = [
-            'WTF_USE_ICU_UNICODE',
-        ],
-    )
-
 if env['PLATFORM'] == 'win32':
     env.Append(
         CPPPATH = [
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 2a1cf79..8aac62e 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -31,13 +31,6 @@ else:
       '$LIBXML_DIR/include',
       ])
 
-  if env['PLATFORM'] == 'posix':
-    env.Append(
-        CPPPATH = [
-            '$LIBXML_DIR/linux/include',
-        ],
-    )
-
 if env['PLATFORM'] == 'posix':
   env.Append(
       CCFLAGS = [
@@ -330,10 +323,12 @@ inputs = [
     '$PORT_DIR/bindings/v8/v8_vectornodelist.cpp',
     '$PORT_DIR/bindings/v8/V8XMLHttpRequestCustom.cpp',
     '$PORT_DIR/page/inspector/InspectorController.cpp',
-
-    'precompiled_v8bindings.cpp',
 ]
 
+if env['PLATFORM'] == 'win32':
+  inputs.append('precompiled_v8bindings.cpp')
+
+
 # TODO(erg): These are temporarily disabled during the merge of code back to
 # WebKit. As soon as we're back on TOT, these go back into the working files
 # section.
@@ -363,8 +358,6 @@ if env['PLATFORM'] in ('darwin', 'posix'):
     '$DERIVED_DIR/V8Navigator.cpp',
     '$DERIVED_DIR/V8Plugin.cpp',
     '$DERIVED_DIR/V8PluginArray.cpp',
-
-    'precompiled_v8bindings.cpp',
   ]
   for remove in remove_files:
     inputs.remove(remove)
diff --git a/webkit/config.h.in b/webkit/config.h.in
index 7a50220..bf2648d 100644
--- a/webkit/config.h.in
+++ b/webkit/config.h.in
@@ -89,10 +89,6 @@
 #include <wtf/DisallowCType.h>
 #endif
 
-#if PLATFORM(CHROMIUM) && !PLATFORM(DARWIN) && !PLATFORM(WIN_OS)
-#define WTF_USE_ICU_UNICODE 1
-#endif
-
 #if COMPILER(MSVC)
 #define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
 #else