More *.scons renaming:...

chrome/installer/mini_installer/mini_installer.scons

Index: chrome/installer/mini_installer/mini_installer.scons
===================================================================
--- chrome/installer/mini_installer/mini_installer.scons	(revision 5480)
+++ chrome/installer/mini_installer/mini_installer.scons	(working copy)
@@ -2,82 +2,94 @@
 # 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')
+Import('env', 'env_res')
 
-
 env = env.Clone()
 
-env['LIBS'].remove('DelayImp.lib')
+env.ApplySConscript([
+    '$GTEST_DIR/../using_gtest.scons',
+])
 
-env_res = env_res.Clone()
-env_test = env_test.Clone()
 
+# 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
 
-env_res.Append(
-    CPPPATH = [
-        "$TARGET_ROOT",
-        ".",
-        "$CHROME_SRC_DIR",
-    ],
-    RCFLAGS = [
-        ["/l", "0x409"],
-    ],
-)
+if env['PLATFORM'] == 'win32':
+  env_res = env_res.Clone()
 
-resources = env_res.RES('mini_installer.rc')
+  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',
+        'chrome',
     ],
 )
 
-env['CCFLAGS'].remove('/RTC1')
+if env['PLATFORM'] == 'win32':
+  env.FilterOut(
+      LIBS = ['DelayImp.lib'],
+      CCFLAGS = ['/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",
-]
+  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",
 ]
 
-exe = env.ChromeProgram('mini_installer', components + resources + input_files)
-i = env.Install('$TARGET_ROOT', exe)
-env.Alias('chrome', i)
+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',
@@ -92,69 +104,3 @@
 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)
-
Property changes on: chrome\installer\mini_installer\mini_installer.scons
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/installer/mini_installer/SConscript:r69-2775