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

Side by Side Diff: net/crash_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 | « no previous file | net/dump_cache.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 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.ApplySConscript([ 13 env.ApplySConscript([
14 '$BASE_DIR/using_base.scons', 14 '$BASE_DIR/using_base.scons',
15 '$GTEST_DIR/../using_gtest.scons', 15 '$GTEST_DIR/../using_gtest.scons',
16 '$ICU38_DIR/using_icu38.scons', 16 '$ICU38_DIR/using_icu38.scons',
17 '$NET_DIR/using_net.scons', 17 '$NET_DIR/using_net.scons',
18 ]) 18 ])
19 19
20 if env.Bit('windows'): 20 if env.Bit('windows'):
21 env.Prepend( 21 env.Prepend(
22 CCFLAGS = [ 22 CCFLAGS = [
23 '/WX', 23 '/WX',
24 ], 24 ],
25 ) 25 )
26 26
27 # TODO: restore to alphabetical order; below matches original .vcproj. 27 input_files = [
28 input_files = ChromeFileList([ 28 'disk_cache/disk_cache_test_util$OBJSUFFIX',
29 'tools/crash_cache/crash_cache.cc', 29 'tools/crash_cache/crash_cache.cc',
30 'disk_cache/disk_cache_test_util$OBJSUFFIX', 30 ]
31 ])
32 31
33 32
34 if not env.AnyBits('linux', 'mac'): 33 if not env.AnyBits('linux', 'mac'):
35 # TODO(port): port to linux and mac? 34 # TODO(port): port to linux and mac?
36 env.ChromeTestProgram('crash_cache', input_files) 35 env.ChromeTestProgram('crash_cache', input_files)
37 36
38 p = env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj', 37 env.ChromeMSVSProject('$NET_DIR/build/crash_cache.vcproj',
39 guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}', 38 dependencies = [
40 dependencies = [ 39 '$BASE_DIR/build/base.vcproj',
41 '$BASE_DIR/build/base.vcproj', 40 '$NET_DIR/build/net.vcproj',
42 '$NET_DIR/build/net.vcproj', 41 '$ICU38_DIR/build/icu.vcproj',
43 '$ICU38_DIR/build/icu.vcproj', 42 ],
44 ], 43 guid='{B0EE0599-2913-46A0-A847-A3EC813658D3}')
45 # TODO: restore when we can derive all info,
46 # on all platforms, from the windows build targets.
47 #buildtargets=TODO,
48 files=input_files,
49 tools=[
50 'VCPreBuildEventTool',
51 'VCCustomBuildTool',
52 'VCXMLDataGeneratorTool',
53 'VCWebServiceProxyGeneratorTool',
54 'VCMIDLTool',
55 'VCCLCompilerTool',
56 'VCManagedResourceCompilerTool',
57 'VCResourceCompilerTool',
58 'VCPreLinkEventTool',
59 MSVSTool('VCLinkerTool',
60 SubSystem='1'),
61 'VCALinkTool',
62 'VCManifestTool',
63 'VCXDCMakeTool',
64 'VCBscMakeTool',
65 'VCFxCopTool',
66 'VCAppVerifierTool',
67 'VCWebDeploymentTool',
68 'VCPostBuildEventTool',
69 ],
70 ConfigurationType='1')
71
72
73 p.AddConfig('Debug|Win32',
74 InheritedPropertySheets=[
75 '$(SolutionDir)../build/common.vsprops',
76 '$(SolutionDir)../build/debug.vsprops',
77 ])
78
79 p.AddConfig('Release|Win32',
80 InheritedPropertySheets=[
81 '$(SolutionDir)../build/common.vsprops',
82 '$(SolutionDir)../build/release.vsprops',
83 ])
84
85 env.AlwaysBuild(p)
86
87 i = env.Command('$CHROME_SRC_DIR/net/build/crash_cache.vcproj', p,
88 Copy('$TARGET', '$SOURCE'))
89 Alias('msvs', i)
OLDNEW
« no previous file with comments | « no previous file | net/dump_cache.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698