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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/installer/mini_installer/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/common/SConscript ('k') | chrome/installer/setup/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', 'env_test') 5 Import('env', 'env_res', 'env_test')
6 6
7 7
8 env = env.Clone() 8 env = env.Clone()
9 9
10 env['LIBS'].remove('DelayImp.lib') 10 env['LIBS'].remove('DelayImp.lib')
11 11
12 env_res = env_res.Clone() 12 env_res = env_res.Clone()
13 env_test = env_test.Clone() 13 env_test = env_test.Clone()
14 14
15 15
16 env_res.Append( 16 env_res.Append(
17 CPPPATH = [ 17 CPPPATH = [
18 "$TARGET_ROOT", 18 "$TARGET_ROOT",
19 ".", 19 ".",
20 "#/..", 20 "$CHROME_SRC_DIR",
21 ], 21 ],
22 RCFLAGS = [ 22 RCFLAGS = [
23 ["/l", "0x409"], 23 ["/l", "0x409"],
24 ], 24 ],
25 ) 25 )
26 26
27 resources = env_res.RES('mini_installer.rc') 27 resources = env_res.RES('mini_installer.rc')
28 28
29 29
30 env.Prepend( 30 env.Prepend(
31 CPPPATH = [ 31 CPPPATH = [
32 '$GTEST_DIR/include', 32 '$GTEST_DIR/include',
33 '$GTEST_DIR', 33 '$GTEST_DIR',
34 '#/..', 34 '$CHROME_SRC_DIR',
35 ], 35 ],
36 CCFLAGS = [ 36 CCFLAGS = [
37 '/TP', 37 '/TP',
38 '/GS-', # because we link with /NODEFAULTLIB 38 '/GS-', # because we link with /NODEFAULTLIB
39 ], 39 ],
40 LINKFLAGS = [ 40 LINKFLAGS = [
41 '/INCREMENTAL', 41 '/INCREMENTAL',
42 '/NODEFAULTLIB', 42 '/NODEFAULTLIB',
43 '/DEBUG', 43 '/DEBUG',
44 '/SUBSYSTEM:WINDOWS', 44 '/SUBSYSTEM:WINDOWS',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 PWD=Dir('.')) 102 PWD=Dir('.'))
103 103
104 104
105 env_test.Prepend( 105 env_test.Prepend(
106 CPPDEFINES = [ 106 CPPDEFINES = [
107 'UNIT_TEST', 107 'UNIT_TEST',
108 ], 108 ],
109 CPPPATH = [ 109 CPPPATH = [
110 '$GTEST_DIR/include', 110 '$GTEST_DIR/include',
111 '$GTEST_DIR', 111 '$GTEST_DIR',
112 '#/..', 112 '$CHROME_SRC_DIR',
113 ], 113 ],
114 LIBS = [ 114 LIBS = [
115 'gtest', 115 'gtest',
116 env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 116 env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed
117 'common', 117 'common',
118 'base', 118 'base',
119 ], 119 ],
120 ) 120 )
121 121
122 env_test.Prepend( 122 env_test.Prepend(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 libs = [ 159 libs = [
160 '../util/util.lib', 160 '../util/util.lib',
161 ] 161 ]
162 162
163 exe = env_test.ChromeTestProgram('installer_unittests', input_files + libs) 163 exe = env_test.ChromeTestProgram('installer_unittests', input_files + libs)
164 i = env_test.Install('$TARGET_ROOT', exe) 164 i = env_test.Install('$TARGET_ROOT', exe)
165 165
166 env.Alias('chrome', i) 166 env.Alias('chrome', i)
167 167
OLDNEW
« no previous file with comments | « chrome/common/SConscript ('k') | chrome/installer/setup/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698