Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Side by Side Diff: chrome/installer/setup/setup.scons

Issue 15051: Convert from using env['PLATFORM'] directly to using the more flexible... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/mini_installer/mini_installer.scons ('k') | chrome/plugin/plugin.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.ApplySConscript([ 9 env.ApplySConscript([
10 '$BASE_DIR/using_base.scons', 10 '$BASE_DIR/using_base.scons',
11 '$BSPATCH_DIR/using_bspatch.scons', 11 '$BSPATCH_DIR/using_bspatch.scons',
12 '$ICU38_DIR/using_icu38.scons', 12 '$ICU38_DIR/using_icu38.scons',
13 '$LZMA_SDK_DIR/using_lzma_sdk.scons', 13 '$LZMA_SDK_DIR/using_lzma_sdk.scons',
14 ]) 14 ])
15 15
16 if env['PLATFORM'] == 'win32': 16 if env.Bit('windows'):
17 env_res = env.Clone() 17 env_res = env.Clone()
18 18
19 env_res.Append( 19 env_res.Append(
20 CPPPATH = [ 20 CPPPATH = [
21 ".", 21 ".",
22 "$CHROME_SRC_DIR", 22 "$CHROME_SRC_DIR",
23 "$CHROME_DIR/installer/util", 23 "$CHROME_DIR/installer/util",
24 ], 24 ],
25 RCFLAGS = [ 25 RCFLAGS = [
26 ["/l", "0x409"], 26 ["/l", "0x409"],
(...skipping 12 matching lines...) Expand all
39 '../util', 39 '../util',
40 '.', 40 '.',
41 '$CHROME_SRC_DIR', 41 '$CHROME_SRC_DIR',
42 ], 42 ],
43 LIBS = [ 43 LIBS = [
44 'common', 44 'common',
45 'util', 45 'util',
46 ], 46 ],
47 ) 47 )
48 48
49 if env['PLATFORM'] == 'win32': 49 if env.Bit('windows'):
50 env.Prepend( 50 env.Prepend(
51 LINKFLAGS = [ 51 LINKFLAGS = [
52 '/INCREMENTAL', 52 '/INCREMENTAL',
53 '/DEBUG', 53 '/DEBUG',
54 54
55 '/DELAYLOAD:"dwmapi.dll"', 55 '/DELAYLOAD:"dwmapi.dll"',
56 '/DELAYLOAD:"uxtheme.dll"', 56 '/DELAYLOAD:"uxtheme.dll"',
57 57
58 '/OPT:NOWIN98', 58 '/OPT:NOWIN98',
59 '/SUBSYSTEM:WINDOWS', 59 '/SUBSYSTEM:WINDOWS',
(...skipping 20 matching lines...) Expand all
80 'setup_constants.cc', 80 'setup_constants.cc',
81 'uninstall.cc', 81 'uninstall.cc',
82 ] 82 ]
83 83
84 env.ChromeProgram('setup', resources + input_files) 84 env.ChromeProgram('setup', resources + input_files)
85 85
86 exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc', 86 exe_version_rc = env.ChromeVersionRC('setup_exe_version.rc',
87 'setup_exe_version.rc.version', 87 'setup_exe_version.rc.version',
88 PWD = env.Dir('.')) 88 PWD = env.Dir('.'))
89 89
90 if env['PLATFORM'] == 'win32': 90 if env.Bit('windows'):
91 # TODO(sgk): implicit dependency should be picked up automatically 91 # TODO(sgk): implicit dependency should be picked up automatically
92 env_res.Depends(resources, exe_version_rc) 92 env_res.Depends(resources, exe_version_rc)
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer/mini_installer.scons ('k') | chrome/plugin/plugin.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698