Convert chrome\renderer to new SCons naming.

Review URL: http://codereview.chromium.org/9053

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

4 files changed, 110 insertions, 75 deletions

diff --git a/chrome/SConscript b/chrome/SConscript
index dd02a36..ce800c8 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -399,7 +399,6 @@ if env['PLATFORM'] == 'win32':
 env.SConscript(test_sconscript_files, exports=['env_test'])
 
 sconscript_files = [
-    'renderer/SConscript',
     'test/chrome_plugin/SConscript',
     'third_party/hunspell/SConscript',
     '$THIRD_PARTY_DIR/sqlite/SConscript',
diff --git a/chrome/chrome.scons b/chrome/chrome.scons
index 42f9489..9b1cd0b 100644
--- a/chrome/chrome.scons
+++ b/chrome/chrome.scons
@@ -16,6 +16,7 @@ sconscript_files = [
     'common/common.scons',
     'common/ipc_tests.scons',
     'plugin/plugin.scons',
+    'renderer/renderer.scons',
 ]
 
 SConscript(sconscript_files, exports=['env'])
diff --git a/chrome/renderer/SConscript b/chrome/renderer/SConscript
deleted file mode 100644
index 76ea461..0000000
--- a/chrome/renderer/SConscript
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-Import('env')
-
-env = env.Clone()
-
-
-env.Prepend(
-    CPPPATH = [
-        '$CHROME_DIR/app/resources',
-        '/chrome/tools/build/win',
-        '$CHROME_SRC_DIR',
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Prepend(
-      CCGLAGS = [
-          '/TP',
-      ],
-  )
-
-env.Append(
-    CPPPATH = [
-        'third_party/wtl/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$NPAPI_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-    ],
-)
-
-input_files = []
-
-# TODO(port): Port to Mac.
-if env['PLATFORM'] in ('posix', 'win32'):
-  input_files.extend([
-      'about_handler.cc',
-      'net/render_dns_queue.cc',
-      'visitedlink_slave.cc',
-  ])
-
-# TODO(port): Port these.
-if env['PLATFORM'] == 'win32':
-  input_files.extend([
-      'automation/dom_automation_controller.cc',
-      'chrome_plugin_host.cc',
-      'debug_message_handler.cc',
-      'dom_ui_bindings.cc',
-      'external_js_object.cc',
-      'external_host_bindings.cc',
-      'greasemonkey_slave.cc',
-      'localized_error.cc',
-      'net/render_dns_master.cc',
-      'plugin_channel_host.cc',
-      'render_process.cc',
-      'render_thread.cc',
-      'render_view.cc',
-      'render_widget.cc',
-      'renderer_glue.cc',
-      'renderer_main.cc',
-      'webplugin_delegate_proxy.cc',
-  ])
-
-# TODO(port): Enable for Mac.
-if env['PLATFORM'] in ('posix', 'win32'):
-  env.ChromeStaticLibrary('renderer', input_files)
diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons
new file mode 100644
index 0000000..73b00cc
--- /dev/null
+++ b/chrome/renderer/renderer.scons
@@ -0,0 +1,109 @@
+# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+Import('env')
+
+env = env.Clone()
+
+env.SConscript([
+    '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$NPAPI_DIR/using_npapi.scons',
+    '$SKIA_DIR/using_skia.scons',
+], {'env':env})
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_DIR/app/resources',
+        '$CHROME_SRC_DIR',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      CPPPATH = [
+          '$CHROME_DIR/tools/build/win',
+      ],
+  )
+
+input_files = [
+    'about_handler.cc',
+    'chrome_plugin_host.cc',
+    'debug_message_handler.cc',
+    'dom_ui_bindings.cc',
+    'external_host_bindings.cc',
+    'external_js_object.cc',
+    'greasemonkey_slave.cc',
+    'localized_error.cc',
+    'plugin_channel_host.cc',
+    'render_process.cc',
+    'render_thread.cc',
+    'render_view.cc',
+    'render_widget.cc',
+    'renderer_glue.cc',
+    'renderer_main.cc',
+    'visitedlink_slave.cc',
+    'webplugin_delegate_proxy.cc',
+
+    'automation/dom_automation_controller.cc',
+
+    'net/render_dns_master.cc',
+    'net/render_dns_queue.cc',
+]
+
+# TODO(port): Port these to Linux
+if env['PLATFORM'] == 'posix':
+  to_be_ported_files = [
+      'automation/dom_automation_controller.cc',
+      'chrome_plugin_host.cc',
+      'debug_message_handler.cc',
+      'dom_ui_bindings.cc',
+      'external_js_object.cc',
+      'external_host_bindings.cc',
+      'greasemonkey_slave.cc',
+      'localized_error.cc',
+      'net/render_dns_master.cc',
+      'plugin_channel_host.cc',
+      'render_process.cc',
+      'render_thread.cc',
+      'render_view.cc',
+      'render_widget.cc',
+      'renderer_glue.cc',
+      'renderer_main.cc',
+      'webplugin_delegate_proxy.cc',
+  ]
+  for remove in to_be_ported_files:
+    input_files.remove(remove)
+
+# TODO(port): Port these to Mac
+if env['PLATFORM'] == 'darin':
+  to_be_ported_files = [
+      'about_handler.cc',
+      'chrome_plugin_host.cc',
+      'debug_message_handler.cc',
+      'dom_ui_bindings.cc',
+      'external_host_bindings.cc',
+      'external_js_object.cc',
+      'greasemonkey_slave.cc',
+      'localized_error.cc',
+      'plugin_channel_host.cc',
+      'render_process.cc',
+      'render_thread.cc',
+      'render_view.cc',
+      'render_widget.cc',
+      'renderer_glue.cc',
+      'renderer_main.cc',
+      'visitedlink_slave.cc',
+      'webplugin_delegate_proxy.cc',
+      'automation/dom_automation_controller.cc',
+      'net/render_dns_master.cc',
+      'net/render_dns_queue.cc',
+  ]
+  for remove in to_be_ported_files:
+    input_files.remove(remove)
+
+
+# TODO(port): Enable for Mac.
+if env['PLATFORM'] in ('posix', 'win32'):
+  env.ChromeStaticLibrary('renderer', input_files)