| OLD | NEW |
| 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 __doc__ = """ | 5 __doc__ = """ |
| 6 Configuration the disk_cache{,.exe} executable. | 6 Configuration the disk_cache{,.exe} executable. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| 11 env = env.Clone() | 11 env = env.Clone() |
| 12 | 12 |
| 13 env.SConscript([ | 13 env.SConscript([ |
| 14 # On Linux, dependencies must follow dependents, so... | 14 # On Linux, dependencies must follow dependents, so... |
| 15 # 1) net must come before base and modp_b64. | 15 # 1) net must come before base and modp_b64. |
| 16 '$NET_DIR/using_net.scons', | 16 '$NET_DIR/using_net.scons', |
| 17 | 17 |
| 18 '$BASE_DIR/using_base.scons', | 18 '$BASE_DIR/using_base.scons', |
| 19 '$GTEST_DIR/../using_gtest.scons', | 19 '$GTEST_DIR/../using_gtest.scons', |
| 20 '$ICU38_DIR/using_icu38.scons', | 20 '$ICU38_DIR/using_icu38.scons', |
| 21 ], {'env':env}) | 21 ], {'env':env}) |
| 22 | 22 |
| 23 env.Prepend( | 23 env.Prepend( |
| 24 CPPPATH = [ | 24 CPPPATH = [ |
| 25 '$ROOT_DIR', | 25 '$CHROME_SRC_DIR', |
| 26 ], | 26 ], |
| 27 ) | 27 ) |
| 28 | 28 |
| 29 if env['PLATFORM'] == 'win32': | 29 if env['PLATFORM'] == 'win32': |
| 30 env.Prepend( | 30 env.Prepend( |
| 31 CCFLAGS = [ | 31 CCFLAGS = [ |
| 32 '/TP', | 32 '/TP', |
| 33 '/WX', | 33 '/WX', |
| 34 ], | 34 ], |
| 35 CPPDEFINES = [ | 35 CPPDEFINES = [ |
| (...skipping 19 matching lines...) Expand all Loading... |
| 55 ] | 55 ] |
| 56 | 56 |
| 57 | 57 |
| 58 if env['PLATFORM'] in ('posix', 'win32'): | 58 if env['PLATFORM'] in ('posix', 'win32'): |
| 59 | 59 |
| 60 crash_cache = env.ChromeTestProgram('crash_cache', input_files) | 60 crash_cache = env.ChromeTestProgram('crash_cache', input_files) |
| 61 | 61 |
| 62 installed_test = env.Install('$TARGET_ROOT', crash_cache) | 62 installed_test = env.Install('$TARGET_ROOT', crash_cache) |
| 63 | 63 |
| 64 env.Alias('net', installed_test) | 64 env.Alias('net', installed_test) |
| OLD | NEW |