Convert browser.lib to the new naming:

* Move chrome/browser/SConscript => chrome/browser/browser.scons.
* Use using_*.scons files instead of by-hand settings.
* Add new using_*.scons files:
    breakpad/using_breakpad.scons
    chrome/third_party/hunspell/using_hunspell.scons
    chrome/third_party/wtl/using_wtl.scons
    google_update/using_google_update.scons
    third_party/npapi/using_npapi.scons
* Delete some unused CPPPATH directories.
Review URL: http://codereview.chromium.org/9243

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

8 files changed, 103 insertions, 39 deletions

diff --git a/breakpad/using_breakpad.scons b/breakpad/using_breakpad.scons
new file mode 100644
index 0000000..27874fc
--- /dev/null
+++ b/breakpad/using_breakpad.scons
@@ -0,0 +1,15 @@
+# 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.
+
+__doc__ = """
+Settings for other components using Breakpad.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$BREAKPAD_DIR/src',
+    ],
+)
diff --git a/chrome/SConscript b/chrome/SConscript
index 77c6ba3b..2c271c1 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 = [
-    'browser/SConscript',
     'common/SConscript',
     'plugin/SConscript',
     'renderer/SConscript',
@@ -413,6 +412,7 @@ if env['PLATFORM'] == 'win32':
   sconscript_files.extend([
       'app/resources/SConscript',
       'app/theme/SConscript',
+      'browser/debugger/SConscript',
       'browser/views/SConscript',
       'installer/mini_installer/SConscript',
       'installer/setup/SConscript',
diff --git a/chrome/browser/SConscript b/chrome/browser/browser.scons
index d648c04..1e99b00 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/browser.scons
@@ -6,55 +6,44 @@ Import('env')
 
 env = env.Clone()
 
+env.SConscript([
+    '$CHROME_DIR/third_party/hunspell/using_hunspell.scons',
+    '$CHROME_DIR/third_party/wtl/using_wtl.scons',
+    '$GOOGLE_UPDATE_DIR/using_google_update.scons',
+    '$GTEST_DIR/../using_gtest.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$LIBPNG_DIR/using_libpng.scons',
+    '$LIBXML_DIR/using_libxml.scons',
+    '$NPAPI_DIR/using_npapi.scons',
+    '$SKIA_DIR/using_skia.scons',
+    '$ZLIB_DIR/using_zlib.scons',
+], {'env':env})
+
+# TODO(sgk):  convert into a using_*.scons pattern when we update WebKit.
+env.Append(
+    CPPPATH = [
+        '$WEBKIT_DIR/build/localized_strings',
+    ],
+)
 
 env.Prepend(
     CPPPATH = [
         '$CHROME_DIR/app/resources',
-        #'$OBJ_ROOT/google_update',
-        '/chrome/tools/build/win',
+        '$CHROME_DIR/app',
         '$CHROME_SRC_DIR',
     ],
     CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-        'USE_HUNSPELL',
-        'HUNSPELL_CHROME_CLIENT',
-        'LIBXML_STATIC',
-        'PNG_USER_CONFIG',
-        'CHROME_PNG_WRITE_SUPPORT',
         'GOOGLE_CHROME_BUILD',
     ],
 )
 
 if env['PLATFORM'] == 'win32':
   env.Prepend(
-      CCFLAGS = [
-          '/TP',
+      CPPPATH = [
+          '$CHROME_DIR/tools/build/win',
       ],
   )
 
-env.Append(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-
-        '$GOOGLE_UPDATE_DIR',
-        '$CHROME_DIR/third_party/hunspell/src/hunspell',
-        '$CHROME_DIR/third_party/wtl/include',
-        '$NPAPI_DIR',
-        '$LIBXML_DIR/DerivedSources/include',
-        '$LIBXML_DIR/include',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/public/i18n',
-        '$CHROME_DIR/app',
-        '$WEBKIT_DIR/build/localized_strings',
-        '$ZLIB_DIR',
-        '$SKIA_DIR/include',
-        '$SKIA_DIR/include/corecg',
-        '$SKIA_DIR/platform',
-        '$LIBPNG_DIR',
-        '$BREAKPAD_DIR/src',
-    ],
-)
-
 input_files = []
 
 if env['PLATFORM'] in ('posix', 'win32'):
@@ -310,8 +299,3 @@ if env['PLATFORM'] == 'win32':
 if env['PLATFORM'] in ('posix', 'win32'):
   # TODO: This should work for all platforms.
   env.ChromeStaticLibrary('browser', input_files)
-
-
-if env['PLATFORM'] == 'win32':
-  # TODO: Port this.
-  SConscript('debugger/SConscript', exports=['env'])
diff --git a/chrome/chrome.scons b/chrome/chrome.scons
index 4e4cfad..b94e8f0 100644
--- a/chrome/chrome.scons
+++ b/chrome/chrome.scons
@@ -11,6 +11,7 @@ Import('env')
 sconscript_files = [
     'SConscript',
 
+    'browser/browser.scons',
     'test/unit/unit_tests.scons',
 ]
 
diff --git a/chrome/third_party/hunspell/using_hunspell.scons b/chrome/third_party/hunspell/using_hunspell.scons
new file mode 100644
index 0000000..5b836a6
--- /dev/null
+++ b/chrome/third_party/hunspell/using_hunspell.scons
@@ -0,0 +1,19 @@
+# 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.
+
+__doc__ = """
+Settings for other components using hunspell.
+"""
+
+Import("env")
+
+env.Append(
+    CPPDEFINES = [
+        'USE_HUNSPELL',
+        'HUNSPELL_CHROME_CLIENT',
+    ],
+    CPPPATH = [
+        '$CHROME_DIR/third_party/hunspell/src/hunspell',
+    ],
+)
diff --git a/chrome/third_party/wtl/using_wtl.scons b/chrome/third_party/wtl/using_wtl.scons
new file mode 100644
index 0000000..21e528a
--- /dev/null
+++ b/chrome/third_party/wtl/using_wtl.scons
@@ -0,0 +1,15 @@
+# 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.
+
+__doc__ = """
+Settings for other components using wtl.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$CHROME_DIR/third_party/wtl/include',
+    ],
+)
diff --git a/google_update/using_google_update.scons b/google_update/using_google_update.scons
new file mode 100644
index 0000000..1469568
--- /dev/null
+++ b/google_update/using_google_update.scons
@@ -0,0 +1,15 @@
+# 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.
+
+__doc__ = """
+Settings for other components using Google Update.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$GOOGLE_UPDATE_DIR',
+    ],
+)
diff --git a/third_party/npapi/using_npapi.scons b/third_party/npapi/using_npapi.scons
new file mode 100644
index 0000000..0e7fc73
--- /dev/null
+++ b/third_party/npapi/using_npapi.scons
@@ -0,0 +1,15 @@
+# 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.
+
+__doc__ = """
+Settings for other components using NPAPI.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$NPAPI_DIR',
+    ],
+)