| 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 for building the stress_cache{,.exe} executable. | 6 Configuration for building the stress_cache{,.exe} executable. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 ], | 29 ], |
| 30 ) | 30 ) |
| 31 | 31 |
| 32 if env.Bit('windows'): | 32 if env.Bit('windows'): |
| 33 env.Prepend( | 33 env.Prepend( |
| 34 CCFLAGS = [ | 34 CCFLAGS = [ |
| 35 '/WX', | 35 '/WX', |
| 36 ], | 36 ], |
| 37 ) | 37 ) |
| 38 | 38 |
| 39 input_files = ChromeFileList([ | 39 input_files = [ |
| 40 'disk_cache/disk_cache_test_util$OBJSUFFIX', | 40 'disk_cache/disk_cache_test_util$OBJSUFFIX', |
| 41 'disk_cache/stress_cache.cc', | 41 'disk_cache/stress_cache.cc', |
| 42 ]) | 42 ] |
| 43 | 43 |
| 44 if not env.Bit('mac'): | 44 if not env.Bit('mac'): |
| 45 env.ChromeTestProgram('stress_cache', input_files) | 45 env.ChromeTestProgram('stress_cache', input_files) |
| 46 | 46 |
| 47 p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj', | 47 env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj', |
| 48 guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}', | 48 dependencies = [ |
| 49 dependencies = [ | 49 '$BASE_DIR/build/base.vcproj', |
| 50 '$BASE_DIR/build/base.vcproj', | 50 '$NET_DIR/build/net.vcproj', |
| 51 '$NET_DIR/build/net.vcproj', | 51 '$ICU38_DIR/build/icu.vcproj', |
| 52 '$ICU38_DIR/build/icu.vcproj', | 52 '$TESTING_DIR/gtest.vcproj', |
| 53 '$TESTING_DIR/gtest.vcproj', | 53 ], |
| 54 ], | 54 guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}') |
| 55 # TODO: restore when we can derive all info, | |
| 56 # on all platforms, from the windows build targets. | |
| 57 #buildtargets=TODO, | |
| 58 files=input_files, | |
| 59 tools=[ | |
| 60 'VCPreBuildEventTool', | |
| 61 'VCCustomBuildTool', | |
| 62 'VCXMLDataGeneratorTool', | |
| 63 'VCWebServiceProxyGeneratorTool', | |
| 64 'VCMIDLTool', | |
| 65 'VCCLCompilerTool', | |
| 66 'VCManagedResourceCompilerTool', | |
| 67 'VCResourceCompilerTool', | |
| 68 'VCPreLinkEventTool', | |
| 69 MSVSTool('VCLinkerTool', | |
| 70 SubSystem='1'), | |
| 71 'VCALinkTool', | |
| 72 'VCManifestTool', | |
| 73 'VCXDCMakeTool', | |
| 74 'VCBscMakeTool', | |
| 75 'VCFxCopTool', | |
| 76 'VCAppVerifierTool', | |
| 77 'VCWebDeploymentTool', | |
| 78 'VCPostBuildEventTool', | |
| 79 ], | |
| 80 ConfigurationType='1') | |
| 81 | |
| 82 | |
| 83 p.AddConfig('Debug|Win32', | |
| 84 InheritedPropertySheets=[ | |
| 85 '$(SolutionDir)../build/common.vsprops', | |
| 86 '$(SolutionDir)../build/debug.vsprops', | |
| 87 ]) | |
| 88 | |
| 89 p.AddConfig('Release|Win32', | |
| 90 InheritedPropertySheets=[ | |
| 91 '$(SolutionDir)../build/common.vsprops', | |
| 92 '$(SolutionDir)../build/release.vsprops', | |
| 93 ]) | |
| 94 | |
| 95 env.AlwaysBuild(p) | |
| 96 | |
| 97 i = env.Command('$CHROME_SRC_DIR/net/build/stress_cache.vcproj', p, | |
| 98 Copy('$TARGET', '$SOURCE')) | |
| 99 Alias('msvs', i) | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 17327:
Back out r7826, which broke the Linux build (Closed)
Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/