More *.scons renaming:...

chrome/installer/setup/setup.scons

Index: chrome/installer/setup/setup.scons
===================================================================
--- chrome/installer/setup/setup.scons	(revision 5480)
+++ chrome/installer/setup/setup.scons	(working copy)
@@ -5,24 +5,29 @@
 Import('env', 'env_res')
 
 env = env.Clone()
-env_res = env_res.Clone()
 
+env.ApplySConscript([
+    '$BASE_DIR/using_base.scons',
+    '$BSPATCH_DIR/using_bspatch.scons',
+    '$ICU38_DIR/using_icu38.scons',
+    '$LZMA_SDK_DIR/using_lzma_sdk.scons',
+])
 
-env_res.Append(
-  CPPPATH = [
-    "$TARGET_ROOT",
-    ".",
-    "$CHROME_SRC_DIR",
-  ],
-  RCFLAGS = [
-    ["/l", "0x409"],
-  ],
-)
+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('setup.rc'),
-]
+  resources = env_res.RES('setup.rc')
 
 
 env.Prepend(
@@ -33,40 +38,38 @@
         '$CHROME_SRC_DIR',
     ],
     LIBS = [
-        'base',
-        'bspatch',
         'common',
-        env['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
-        'lzma_sdk',
         'util',
     ],
 )
 
-env.Prepend(
-    LINKFLAGS = [
-        '/INCREMENTAL',
-        '/DEBUG',
+if env['PLATFORM'] == 'win32':
+  env.Prepend(
+      LINKFLAGS = [
+          '/INCREMENTAL',
+          '/DEBUG',
 
-        '/DELAYLOAD:"dwmapi.dll"',
-        '/DELAYLOAD:"uxtheme.dll"',
+          '/DELAYLOAD:"dwmapi.dll"',
+          '/DELAYLOAD:"uxtheme.dll"',
 
-        '/OPT:NOWIN98',
-        '/SUBSYSTEM:WINDOWS',
-        '/MACHINE:X86',
-        '/FIXED:No',
+          '/OPT:NOWIN98',
+          '/SUBSYSTEM:WINDOWS',
+          '/MACHINE:X86',
+          '/FIXED:No',
 
-        '/safeseh',
-        '/dynamicbase',
-        '/ignore:4199',
-        '/nxcompat',
+          '/safeseh',
+          '/dynamicbase',
+          '/ignore:4199',
+          '/nxcompat',
 
-        '/PDB:${TARGETS[1]}',
-    ],
-    LIBS = [
-        'msi.lib',
-    ],
-)
+          '/PDB:${TARGETS[1]}',
+      ],
+      LIBS = [
+          'msi',
+      ],
+  )
 
+
 input_files = [
     'install.cc',
     'main.cc',
@@ -75,13 +78,8 @@
     'uninstall.cc',
 ]
 
-exe = env.ChromeProgram('setup', resources + input_files)
-i = env.Install('$TARGET_ROOT', exe)
+env.ChromeProgram('setup', resources + input_files)
 
-env.Alias('chrome', i)
-
-
 env.ChromeVersionRC('setup_exe_version.rc',
                     'setup_exe_version.rc.version',
                     PWD = env.Dir('.'))
-
Property changes on: chrome\installer\setup\setup.scons
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/installer/setup/SConscript:r69-2775