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

Side by Side Diff: net/dump_cache.scons

Issue 17327: Back out r7826, which broke the Linux build (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 11 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
« no previous file with comments | « net/crash_cache.scons ('k') | net/net_lib.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 __doc__ = """ 5 __doc__ = """
6 Configuration the dump_cache{,.exe} executable. 6 Configuration the dump_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.ApplySConscript([ 13 env.ApplySConscript([
14 '$BASE_DIR/using_base.scons', 14 '$BASE_DIR/using_base.scons',
15 '$ICU38_DIR/using_icu38.scons', 15 '$ICU38_DIR/using_icu38.scons',
16 '$NET_DIR/using_net.scons', 16 '$NET_DIR/using_net.scons',
17 ]) 17 ])
18 18
19 if env.Bit('windows'): 19 if env.Bit('windows'):
20 env.Prepend( 20 env.Prepend(
21 CCFLAGS = [ 21 CCFLAGS = [
22 '/WX', 22 '/WX',
23 ], 23 ],
24 ) 24 )
25 25
26 input_files = ChromeFileList([ 26 input_files = [
27 'tools/dump_cache/dump_cache.cc', 27 'tools/dump_cache/dump_cache.cc',
28 'tools/dump_cache/dump_files.cc', 28 'tools/dump_cache/dump_files.cc',
29 'tools/dump_cache/upgrade.cc', 29 'tools/dump_cache/upgrade.cc',
30 ]) 30 ]
31 31
32 32
33 if env.Bit('windows'): 33 if env.Bit('windows'):
34 34
35 env.ChromeTestProgram('dump_cache', input_files) 35 env.ChromeTestProgram('dump_cache', input_files)
36 36
37 p = env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj', 37 env.ChromeMSVSProject('$NET_DIR/build/dump_cache.vcproj',
38 guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}', 38 dependencies = [
39 dependencies = [ 39 '$BASE_DIR/build/base.vcproj',
40 '$BASE_DIR/build/base.vcproj', 40 '$ICU38_DIR/build/icu.vcproj',
41 '$ICU38_DIR/build/icu.vcproj', 41 '$NET_DIR/build/net.vcproj',
42 '$NET_DIR/build/net.vcproj', 42 ],
43 ], 43 guid='{4A14E455-2B7C-4C0F-BCC2-35A9666C186F}')
44 # TODO: restore when we can derive all info,
45 # on all platforms, from the windows build targets.
46 #buildtargets=TODO,
47 files=input_files,
48 tools=[
49 'VCPreBuildEventTool',
50 'VCCustomBuildTool',
51 'VCXMLDataGeneratorTool',
52 'VCWebServiceProxyGeneratorTool',
53 'VCMIDLTool',
54 'VCCLCompilerTool',
55 'VCManagedResourceCompilerTool',
56 'VCResourceCompilerTool',
57 'VCPreLinkEventTool',
58 MSVSTool('VCLinkerTool',
59 SubSystem='1'),
60 'VCALinkTool',
61 'VCManifestTool',
62 'VCXDCMakeTool',
63 'VCBscMakeTool',
64 'VCFxCopTool',
65 'VCAppVerifierTool',
66 'VCWebDeploymentTool',
67 'VCPostBuildEventTool',
68 ],
69 ConfigurationType='1')
70
71
72 p.AddConfig('Debug|Win32',
73 InheritedPropertySheets=[
74 '$(SolutionDir)../build/common.vsprops',
75 '$(SolutionDir)../build/debug.vsprops',
76 ])
77
78 p.AddConfig('Release|Win32',
79 InheritedPropertySheets=[
80 '$(SolutionDir)../build/common.vsprops',
81 '$(SolutionDir)../build/release.vsprops',
82 ])
83
84 env.AlwaysBuild(p)
85
86 i = env.Command('$CHROME_SRC_DIR/net/build/dump_cache.vcproj', p,
87 Copy('$TARGET', '$SOURCE'))
88 Alias('msvs', i)
OLDNEW
« no previous file with comments | « net/crash_cache.scons ('k') | net/net_lib.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698