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, 174 insertions, 160 deletions

diff --git a/chrome/installer/mini_installer/SConscript b/chrome/installer/mini_installer/SConscript
deleted file mode 100644
index 40cccb5..0000000
--- a/chrome/installer/mini_installer/SConscript
+++ /dev/null
@@ -1,160 +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_res', 'env_test')
-
-
-env = env.Clone()
-
-env['LIBS'].remove('DelayImp.lib')
-
-env_res = env_res.Clone()
-env_test = env_test.Clone()
-
-
-env_res.Append(
-    CPPPATH = [
-        "$TARGET_ROOT",
-        ".",
-        "$CHROME_SRC_DIR",
-    ],
-    RCFLAGS = [
-        ["/l", "0x409"],
-    ],
-)
-
-resources = env_res.RES('mini_installer.rc')
-
-
-env.Prepend(
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$CHROME_SRC_DIR',
-    ],
-    CCFLAGS = [
-        '/TP',
-        '/GS-',         # because we link with /NODEFAULTLIB
-    ],
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/NODEFAULTLIB',
-        '/DEBUG',
-        '/SUBSYSTEM:WINDOWS',
-        '/OPT:NOWIN98',
-        '/ENTRY:"MainEntryPoint"',
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/SAFESEH:NO',
-        '/NXCOMPAT',
-        '/DYNAMICBASE:NO',
-
-        '/PDB:${TARGETS[1]}',
-        #'/MAP:${TARGETS[2]}',
-    ],
-    LIBS = [
-        'shlwapi.lib',
-    ],
-)
-
-env['CCFLAGS'].remove('/RTC1')
-
-components = [
-    "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
-    "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
-    #"$TARGET_ROOT/chrome_dll.lib",
-    "$TARGET_ROOT/chrome.lib",
-]
-
-input_files = [
-    "mini_installer.cc",
-    "pe_resource.cc",
-]
-
-exe = env.ChromeProgram('mini_installer', components + resources + input_files)
-i = env.Install('$TARGET_ROOT', exe)
-env.Alias('chrome', i)
-
-
-env.AppendENVPath('PATH', r'C:\WINDOWS\system32')
-
-packed = env.Command('$TARGET_ROOT/packed_files.txt',
-                     ['$CHROME_DIR/tools/build/win/create_installer_archive.py',
-                      '$CHROME_DIR/installer/mini_installer/chrome.release'],
-                     ('$PYTHON ${SOURCES[0]}'
-                      ' --output_dir=${TARGET.dir}'
-                      ' --input_file=${SOURCES[1]}'))
-env.Depends(packed, '$TARGET_ROOT/setup.exe')
-
-
-env.ChromeVersionRC('mini_installer_exe_version.rc',
-                    'mini_installer_exe_version.rc.version',
-                    PWD=Dir('.'))
-
-
-env_test.Prepend(
-    CPPDEFINES = [
-        'UNIT_TEST',
-    ],
-    CPPPATH = [
-        '$GTEST_DIR/include',
-        '$GTEST_DIR',
-        '$CHROME_SRC_DIR',
-    ],
-    LIBS = [
-        'gtest',
-        env_test['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-        'common',
-        'base',
-    ],
-)
-
-env_test.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
-
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
-
-        '/MACHINE:X86',
-        '/FIXED:No',
-
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
-    ],
-    LIBS = [
-        'comsupp.lib',
-        'oleacc.lib',
-        'rpcrt4.lib',
-        'shlwapi.lib',
-    ],
-)
-
-input_files = [
-    '../setup/setup_constants$OBJSUFFIX',
-    '../util/copy_tree_work_item_unittest.cc',
-    '../util/create_dir_work_item_unittest.cc',
-    '../util/create_reg_key_work_item_unittest.cc',
-    '../util/delete_reg_value_work_item_unittest.cc',
-    '../util/delete_tree_work_item_unittest.cc',
-    '../util/google_chrome_distribution_unittest.cc',
-    '../util/helper_unittest.cc',
-    '../util/run_all_unittests.cc',
-    '../util/set_reg_value_work_item_unittest.cc',
-    '../util/work_item_list_unittest.cc',
-]
-
-libs = [
-    '../util/util.lib',
-]
-
-exe = env_test.ChromeTestProgram('installer_unittests', input_files + libs)
-i = env_test.Install('$TARGET_ROOT', exe)
-
-env.Alias('chrome', i)
-
diff --git a/chrome/installer/mini_installer/installer_unittests.scons b/chrome/installer/mini_installer/installer_unittests.scons
new file mode 100644
index 0000000..13119b9
--- /dev/null
+++ b/chrome/installer/mini_installer/installer_unittests.scons
@@ -0,0 +1,68 @@
+# 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.ApplySConscript([
+    '$BASE_DIR/using_base.scons',
+    '$GTEST_DIR/../using_gtest.scons',
+    '$ICU38_DIR/using_icu38.scons',
+])
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_SRC_DIR',
+    ],
+    LIBS = [
+        'common',
+        'util',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.FilterOut(
+      LIBS = ['DelayImp.lib'],
+  )
+
+  env.Prepend(
+      LINKFLAGS = [
+          '/INCREMENTAL',
+          '/DEBUG',
+
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
+
+          '/MACHINE:X86',
+          '/FIXED:No',
+
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
+      ],
+      LIBS = [
+          'comsupp',
+          'oleacc',
+          'rpcrt4',
+          'shlwapi',
+      ],
+  )
+
+input_files = [
+    '../setup/setup_constants$OBJSUFFIX',
+    '../util/copy_tree_work_item_unittest.cc',
+    '../util/create_dir_work_item_unittest.cc',
+    '../util/create_reg_key_work_item_unittest.cc',
+    '../util/delete_reg_value_work_item_unittest.cc',
+    '../util/delete_tree_work_item_unittest.cc',
+    '../util/google_chrome_distribution_unittest.cc',
+    '../util/helper_unittest.cc',
+    '../util/run_all_unittests.cc',
+    '../util/set_reg_value_work_item_unittest.cc',
+    '../util/work_item_list_unittest.cc',
+]
+
+env.ChromeTestProgram('installer_unittests', input_files)
diff --git a/chrome/installer/mini_installer/mini_installer.scons b/chrome/installer/mini_installer/mini_installer.scons
new file mode 100644
index 0000000..a6b5dc4
--- /dev/null
+++ b/chrome/installer/mini_installer/mini_installer.scons
@@ -0,0 +1,106 @@
+# 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_res')
+
+env = env.Clone()
+
+env.ApplySConscript([
+    '$GTEST_DIR/../using_gtest.scons',
+])
+
+
+# TODO(port):  Don't be too fooled by the presence of all the
+# if env['PLATFORM'] == 'win32' tests in this file into thinking
+# this is necessarily portable.  They're just there to wall off the
+# obviously windows-specific things
+
+if env['PLATFORM'] == 'win32':
+  env_res = env_res.Clone()
+
+  env_res.Append(
+      CPPPATH = [
+          "$TARGET_ROOT",
+          ".",
+          "$CHROME_SRC_DIR",
+      ],
+      RCFLAGS = [
+          ["/l", "0x409"],
+      ],
+  )
+
+  resources = env_res.RES('mini_installer.rc')
+
+
+env.Prepend(
+    CPPPATH = [
+        '$CHROME_SRC_DIR',
+    ],
+    LIBS = [
+        'chrome',
+    ],
+)
+
+if env['PLATFORM'] == 'win32':
+  env.FilterOut(
+      LIBS = ['DelayImp.lib'],
+      CCFLAGS = ['/RTC1'],
+  )
+
+  env.Prepend(
+      CCFLAGS = [
+          '/TP',
+          '/GS-',         # because we link with /NODEFAULTLIB
+      ],
+      LINKFLAGS = [
+          '/INCREMENTAL',
+          '/NODEFAULTLIB',
+          '/DEBUG',
+          '/SUBSYSTEM:WINDOWS',
+          '/OPT:NOWIN98',
+          '/ENTRY:"MainEntryPoint"',
+          '/MACHINE:X86',
+          '/FIXED:No',
+
+          '/SAFESEH:NO',
+          '/NXCOMPAT',
+          '/DYNAMICBASE:NO',
+
+          '/PDB:${TARGETS[1]}',
+          #'/MAP:${TARGETS[2]}',
+      ],
+      LIBS = [
+          'shlwapi',
+      ],
+  )
+
+input_files = [
+    "mini_installer.cc",
+    "pe_resource.cc",
+]
+
+if env['PLATFORM'] == 'win32':
+  input_files.extend([
+      "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/memset.obj",
+      "$VISUAL_STUDIO/VC/crt/src/intel/mt_lib/P4_memset.obj",
+  ])
+  input_files.extend(resources)
+
+env.ChromeProgram('mini_installer', input_files)
+
+
+env.AppendENVPath('PATH', r'C:\WINDOWS\system32')
+
+packed = env.Command('$TARGET_ROOT/packed_files.txt',
+                     ['$CHROME_DIR/tools/build/win/create_installer_archive.py',
+                      '$CHROME_DIR/installer/mini_installer/chrome.release'],
+                     ('$PYTHON ${SOURCES[0]}'
+                      ' --output_dir=${TARGET.dir}'
+                      ' --input_file=${SOURCES[1]}'))
+env.Depends(packed, '$TARGET_ROOT/setup.exe')
+
+
+env.ChromeVersionRC('mini_installer_exe_version.rc',
+                    'mini_installer_exe_version.rc.version',
+                    PWD=Dir('.'))