From 8028073b0921bfac4b7987e9dcd677263973df05 Mon Sep 17 00:00:00 2001
From: "evanm@google.com"
 <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 23 Aug 2008 01:10:02 +0000
Subject: Rearrange the SConscript a bit to show which parts we build and which
 ones we don't.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1268 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/SConscript | 65 +++++++++++++++++++++++++------------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

(limited to 'webkit')

diff --git a/webkit/SConscript b/webkit/SConscript
index b46b95d..74dff83 100644
--- a/webkit/SConscript
+++ b/webkit/SConscript
@@ -164,17 +164,22 @@ env.Append(
     ],
 )
 
+# This list is the SConscripts that work on Windows and Linux.
+sconscript_dirs = [
+  'SConscript.javascriptcore_pcre',
+  'build/JSConfig/SConscript',
+  'build/JavaScriptCore/SConscript',
+  'build/port/SConscript',
+  'build/V8Bindings/SConscript',
+]
 if env['PLATFORM'] == 'win32':
-    sconscript_dirs = [
+  # These extra dirs aren't win32-specific, they're just the dirs that
+  # haven't yet been made portable.
+  sconscript_dirs.extend([
     'SConscript.port',
-    'SConscript.javascriptcore_pcre',
     'activex_shim/SConscript',
     'activex_shim_dll/SConscript',
-    'build/JSConfig/SConscript',
-    'build/JavaScriptCore/SConscript',
     'build/localized_strings/SConscript',
-    'build/port/SConscript',
-    'build/V8Bindings/SConscript',
     'build/WebCore/SConscript',
     'default_plugin/SConscript',
     'glue/SConscript',
@@ -182,37 +187,25 @@ if env['PLATFORM'] == 'win32':
     'tools/npapi_layout_test_plugin/SConscript',
     'tools/test_shell/SConscript',
     'tools/test_shell/resources/fonts/SConscript',
-    ]
-
-    env.Append(
-        CPPDEFINES = [
-                '_CRT_SECURE_NO_DEPRECATE',
-                '_CRT_NONSTDC_NO_WARNINGS',
-                '_CRT_NONSTDC_NO_DEPRECATE',
-                ['CRASH', '__debugbreak'],
-                '_WIN32_WINNT=0x0600',
-                'WINVER=0x0600',
-                ])
-
-    env.Prepend(
-        CPPPATH = [
-        '$WEBKIT_DIR/port/os-win32',
-        '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32',
-        ])
+  ])
+
+  env.Append(
+    CPPDEFINES = [
+      '_CRT_SECURE_NO_DEPRECATE',
+      '_CRT_NONSTDC_NO_WARNINGS',
+      '_CRT_NONSTDC_NO_DEPRECATE',
+      ['CRASH', '__debugbreak'],
+      '_WIN32_WINNT=0x0600',
+      'WINVER=0x0600',
+    ])
+
+  env.Prepend(
+    CPPPATH = [
+      '$WEBKIT_DIR/port/os-win32',
+      '$THIRD_PARTY_WEBKIT_DIR/JavaScriptCore/os-win32',
+    ])
 else:
-    env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'])
-
-    sconscript_dirs = [
-# TODO(erg): For now, only JavaScriptCore compiles and links; the rest is next.
-#    'SConscript.port',
-    'SConscript.javascriptcore_pcre',
-    'build/JSConfig/SConscript',
-    'build/JavaScriptCore/SConscript',
-#    'build/localized_strings/SConscript',
-    'build/port/SConscript',
-    'build/V8Bindings/SConscript',
-#    'build/WebCore/SConscript',
-    ]
+  env.Prepend(CPPPATH = ['$WEBKIT_DIR/build/JSConfig/WebCore/v8'])
 env.SConscript(sconscript_dirs, exports=['env', 'env_res'])
 
 # Setup alias for all webkit related targets.
-- 
cgit v1.1