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

Side by Side Diff: chrome/installer/setup/SConscript

Issue 7847: Using $CHROME_SRC_DIR in place of hash/..... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 months 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/SConscript ('k') | chrome/installer/util/SConscript » ('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', 'env_res') 5 Import('env', 'env_res')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 env_res = env_res.Clone() 8 env_res = env_res.Clone()
9 9
10 10
11 env_res.Append( 11 env_res.Append(
12 CPPPATH = [ 12 CPPPATH = [
13 "$TARGET_ROOT", 13 "$TARGET_ROOT",
14 ".", 14 ".",
15 "#/..", 15 "$CHROME_SRC_DIR",
16 ], 16 ],
17 RCFLAGS = [ 17 RCFLAGS = [
18 ["/l", "0x409"], 18 ["/l", "0x409"],
19 ], 19 ],
20 ) 20 )
21 21
22 22
23 resources = [ 23 resources = [
24 env_res.RES('setup.rc'), 24 env_res.RES('setup.rc'),
25 ] 25 ]
26 26
27 27
28 env.Prepend( 28 env.Prepend(
29 CPPPATH = [ 29 CPPPATH = [
30 '../util', 30 '../util',
31 '$TARGET_ROOT', 31 '$TARGET_ROOT',
32 '.', 32 '.',
33 '#/..', 33 '$CHROME_SRC_DIR',
34 ], 34 ],
35 LIBS = [ 35 LIBS = [
36 'base', 36 'base',
37 'bspatch', 37 'bspatch',
38 'common', 38 'common',
39 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 39 env['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed
40 'lzma_sdk', 40 'lzma_sdk',
41 'util', 41 'util',
42 ], 42 ],
43 ) 43 )
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 exe = env.ChromeProgram(targets, resources + input_files) 88 exe = env.ChromeProgram(targets, resources + input_files)
89 i = env.Install('$TARGET_ROOT', exe) 89 i = env.Install('$TARGET_ROOT', exe)
90 90
91 env.Alias('chrome', i) 91 env.Alias('chrome', i)
92 92
93 93
94 env.ChromeVersionRC('setup_exe_version.rc', 94 env.ChromeVersionRC('setup_exe_version.rc',
95 'setup_exe_version.rc.version', 95 'setup_exe_version.rc.version',
96 PWD = env.Dir('.')) 96 PWD = env.Dir('.'))
97 97
OLDNEW
« no previous file with comments | « chrome/installer/mini_installer/SConscript ('k') | chrome/installer/util/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698