More *.scons renaming:

* Rename SConscript to *.scons in the following directories:
  third_party\{bspatch,bsdiff,lzma_dsk}
  chrome\installer\{setup,mini_installer,util}
* Split mini_installer and installer_unittests into separate *.scons files.
* Add using_bspatch.scons and using_lzma_sdk.scons "properties" files,
  modifying other *.scons files to use them as appropriate.
Review URL: http://codereview.chromium.org/10952

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

3 files changed, 67 insertions, 72 deletions

diff --git a/third_party/lzma_sdk/SConscript b/third_party/lzma_sdk/SConscript
deleted file mode 100644
index 679d362..0000000
--- a/third_party/lzma_sdk/SConscript
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2008, Google Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#    * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#    * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#    * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Import('env')
-
-env = env.Clone(
-)
-
-env.Prepend(
-    CPPPATH = [
-        '.',
-        '../../',
-    ]
-)
-
-env.Append(
-    CPPDEFINES = [
-        '_LZMA_PROB32',
-        '_LZMA_IN_CB',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-    CCFLAGS = [
-        '/TC',
-        '/wd4800',
-    ],
-  )
-
-input_files = [
-    '7zCrc.c',
-    'Archive/7z/7zAlloc.c',
-    'Archive/7z/7zBuffer.c',
-    'Archive/7z/7zDecode.c',
-    'Archive/7z/7zExtract.c',
-    'Archive/7z/7zHeader.c',
-    'Archive/7z/7zIn.c',
-    'Archive/7z/7zItem.c',
-    'Archive/7z/7zMethodID.c',
-    'Compress/Branch/BranchX86.c',
-    'Compress/Branch/BranchX86_2.c',
-    'Compress/Lzma/LzmaDecode.c',
-]
-
-env.ChromeStaticLibrary('lzma_sdk', input_files)
diff --git a/third_party/lzma_sdk/lzma_sdk.scons b/third_party/lzma_sdk/lzma_sdk.scons
new file mode 100644
index 0000000..b76a2d22
--- /dev/null
+++ b/third_party/lzma_sdk/lzma_sdk.scons
@@ -0,0 +1,46 @@
+# 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_SRC_DIR',
+    ]
+)
+
+env.Append(
+    CPPDEFINES = [
+        '_LZMA_PROB32',
+        '_LZMA_IN_CB',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.Append(
+    CCFLAGS = [
+        '/TC',
+        '/wd4800',
+    ],
+  )
+
+input_files = [
+    '7zCrc.c',
+    'Archive/7z/7zAlloc.c',
+    'Archive/7z/7zBuffer.c',
+    'Archive/7z/7zDecode.c',
+    'Archive/7z/7zExtract.c',
+    'Archive/7z/7zHeader.c',
+    'Archive/7z/7zIn.c',
+    'Archive/7z/7zItem.c',
+    'Archive/7z/7zMethodID.c',
+    'Compress/Branch/BranchX86.c',
+    'Compress/Branch/BranchX86_2.c',
+    'Compress/Lzma/LzmaDecode.c',
+]
+
+env.ChromeStaticLibrary('lzma_sdk', input_files)
diff --git a/third_party/lzma_sdk/using_lzma_sdk.scons b/third_party/lzma_sdk/using_lzma_sdk.scons
new file mode 100644
index 0000000..d3f4801
--- /dev/null
+++ b/third_party/lzma_sdk/using_lzma_sdk.scons
@@ -0,0 +1,21 @@
+# 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 the lzma_sdk library.
+"""
+
+Import("env")
+
+env.Append(
+    CPPPATH = [
+        '$LZMA_SDK_DIR',
+    ],
+    CPPDEFINES = [
+        "_LZMA_IN_CB",
+    ],
+    LIBS = [
+        'lzma_sdk',
+    ],
+)