SCons renaming updates for base, net and googleurl:

* Rename SConscript files to {module}.scons or {moduel}_lib.scons,
  depending on the primary target involved.
* Separate targets into individual *.scons files, with one
  construction environment (named "env") per *.scons file.
* Add using_{module}.scons files (like .vsprops) that will be used
  by other modules to add CPPDEFINES, CPPPATH, LIBS and LIBPATH values.
* Update other modules' *.scons files to use the new using_{module}.scons
  files (using a temporary one-liner idiom until we have the
  ApplySConscript() method from the Hammer modules).
* Use the idiom of removing to-be-ported files from the master list,
  so they can be simply deleted from the to-be-ported list as they
  get ported in the future, instead of having to shuffle entries
  between lists.
* Use $OBJ_ROOT instead of hard-coded '#/$BUILD_TYPE/' for the $*_DIR
  variables.
* Add a addRepository() call mapping build/ to $TARGET_ROOT/googleurl,
  so its $OBJ_ROOT value can look like the others'.
* Formatting changes, primarily modifying indentation to conform to
  style guidelines.
* Fix copyright headers in some third_party/* modules
  previously overlooked.
* Add rudimentary __doc__ strings, setting up for a future
  ability to generate meaningful documentation.


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

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

2 files changed, 54 insertions, 52 deletions

diff --git a/net/tools/tld_cleanup/SConscript b/net/tools/tld_cleanup/SConscript
deleted file mode 100644
index 5ab7e82..0000000
--- a/net/tools/tld_cleanup/SConscript
+++ /dev/null
@@ -1,52 +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 = [
-        '../../..',
-    ],
-    LIBS = [
-      'googleurl',
-      env['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-      'base',
-      # We only need to link with net due to use precompiled_net.pch.
-      'net',
-    ],
-)
-
-env.Append(
-    CCFLAGS = [
-        '/TP',
-    ],
-
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/MANIFEST',
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-        '/DEBUG',
-        '/SUBSYSTEM:CONSOLE',
-        '/MACHINE:X86',
-        '/FIXED:No',
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-)
-
-input_files = [
-    'tld_cleanup.cc',
-]
-
-exe_targets = env.ChromeProgram('tld_cleanup', input_files)
-i = env.Install('$TARGET_ROOT', exe_targets)
-env.Alias('net', i)
-
-env.Install('$TARGET_ROOT', exe_targets)
-
diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons
new file mode 100644
index 0000000..4819883
--- /dev/null
+++ b/net/tools/tld_cleanup/tld_cleanup.scons
@@ -0,0 +1,54 @@
+# 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__ = """
+Configuration the tld_cleanup{,.exe} executable.
+"""
+
+Import('env')
+
+env = env.Clone()
+
+env.SConscript([
+    '$BASE_DIR/using_base.scons',
+    '#/../build/using_googleurl.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$NET_DIR/using_net.scons',
+], {'env':env})
+
+env.Prepend(
+    CPPPATH = [
+        '$ROOT_DIR',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+      CCFLAGS = [
+          '/TP',
+      ],
+
+      LINKFLAGS = [
+          '/INCREMENTAL',
+          '/MANIFEST',
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
+          '/DEBUG',
+          '/SUBSYSTEM:CONSOLE',
+          '/MACHINE:X86',
+          '/FIXED:No',
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
+      ],
+  )
+
+input_files = [
+    'tld_cleanup.cc',
+]
+
+tld_cleanup = env.ChromeProgram('tld_cleanup', input_files)
+i = env.Install('$TARGET_ROOT', tld_cleanup)
+env.Alias('net', i)