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 Import('env') | 5 Import('env') |
6 | 6 |
7 env = env.Clone() | 7 env = env.Clone() |
8 | 8 |
9 env.ApplySConscript([ | 9 env.ApplySConscript([ |
10 '$BASE_DIR/using_base.scons', | 10 '$BASE_DIR/using_base.scons', |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 ], | 53 ], |
54 LIBS = [ | 54 LIBS = [ |
55 'comsupp', | 55 'comsupp', |
56 'oleacc', | 56 'oleacc', |
57 'psapi', | 57 'psapi', |
58 'rpcrt4', | 58 'rpcrt4', |
59 'winmm', | 59 'winmm', |
60 ], | 60 ], |
61 ) | 61 ) |
62 | 62 |
63 input_files = [ | 63 input_files = ChromeFileList([ |
| 64 # TODO(sgk): violate standard indentation so we don't have to |
| 65 # reindent too much when we remove the explicit MSVSFilter() calls |
| 66 # in favor of generating the hierarchy to reflect the file system. |
| 67 MSVSFilter('Common', [ |
| 68 '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', |
| 69 '$CHROME_DIR/tools/build/win/precompiled_wtl.h', |
64 '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', | 70 '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', |
| 71 '$CHROME_DIR/test/testing_browser_process.h', |
65 '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', | 72 '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', |
| 73 '$CHROME_DIR/test/ui/ui_test.h', |
66 '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', | 74 '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', |
| 75 ]), |
| 76 MSVSFilter('TabSwitchingTest', [ |
67 'tab_switching_test.cc', | 77 'tab_switching_test.cc', |
68 ] | 78 ]), |
| 79 ]) |
69 | 80 |
70 #"..\..\Debug\obj\tab_switching_test\precompiled_wtl.obj" | 81 if not env.Bit('windows'): |
| 82 # Windows-specific. |
| 83 input_files.Remove( |
| 84 '$CHROME_DIR/tools/build/win/precompiled_wtl$OBJSUFFIX', |
| 85 '$CHROME_DIR/tools/build/win/precompiled_wtl.h', |
| 86 ) |
71 | 87 |
72 # TODO(port): | 88 # TODO(port): |
73 if env.Bit('windows'): | 89 if env.Bit('windows'): |
74 env.ChromeTestProgram('tab_switching_test', input_files) | 90 env.ChromeTestProgram('tab_switching_test', input_files) |
75 | 91 |
76 env.ChromeMSVSProject('$CHROME_DIR/test/tab_switching/tab_switching.vcproj', | 92 p = env.ChromeMSVSProject('tab_switching.vcproj', |
77 name='tab_switching_test', | 93 name='tab_switching_test', |
78 dependencies = [ | 94 dest=('$CHROME_SRC_DIR/chrome/' |
79 '$CHROME_DIR/test/automation/automation.vcproj', | 95 + 'test/tab_switching/tab_switching.vcproj'), |
80 '$BASE_DIR/build/base.vcproj', | 96 guid='{A34770EA-A574-43E8-9327-F79C04770E98}', |
81 '$NET_DIR/build/net.vcproj', | 97 dependencies = [ |
82 '$CHROME_DIR/browser/browser.vcproj', | 98 '$CHROME_DIR/test/automation/automation.vcproj', |
83 '$MODP_B64_DIR/modp_b64.vcproj', | 99 '$BASE_DIR/build/base.vcproj', |
84 '$CHROME_DIR/test/ui/ui_tests.vcproj', | 100 '$NET_DIR/build/net.vcproj', |
85 '$CHROME_DIR/app/chrome_exe.vcproj', | 101 '$CHROME_DIR/browser/browser.vcproj', |
86 '$ZLIB_DIR/zlib.vcproj', | 102 '$MODP_B64_DIR/modp_b64.vcproj', |
87 '$CHROME_DIR/common/common.vcproj', | 103 '$CHROME_DIR/test/ui/ui_tests.vcproj', |
88 '$ICU38_DIR/build/icu.vcproj', | 104 '$CHROME_DIR/app/chrome_exe.vcproj', |
89 '$BASE_DIR/build/base_gfx.vcproj', | 105 '$ZLIB_DIR/zlib.vcproj', |
90 '$TESTING_DIR/gtest.vcproj', | 106 '$CHROME_DIR/common/common.vcproj', |
91 '$LIBPNG_DIR/libpng.vcproj', | 107 '$ICU38_DIR/build/icu.vcproj', |
92 '$SKIA_DIR/skia.vcproj', | 108 '$BASE_DIR/build/base_gfx.vcproj', |
93 '$GOOGLEURL_DIR/build/googleurl.vcproj', | 109 '$TESTING_DIR/gtest.vcproj', |
94 '$CHROME_DIR/browser/views/browser_views.vcproj', | 110 '$LIBPNG_DIR/libpng.vcproj', |
95 ], | 111 '$SKIA_DIR/skia.vcproj', |
96 guid='{A34770EA-A574-43E8-9327-F79C04770E98}') | 112 '$GOOGLEURL_DIR/build/googleurl.vcproj', |
| 113 '$CHROME_DIR/browser/views/browser_views.vcproj', |
| 114 ], |
| 115 # TODO(sgk): when we can intuit the hierarchy |
| 116 # from the built targets. |
| 117 #buildtargets=TODO, |
| 118 files=input_files, |
| 119 local_directory_prefix='./', |
| 120 tools=[ |
| 121 'VCPreBuildEventTool', |
| 122 'VCCustomBuildTool', |
| 123 'VCXMLDataGeneratorTool', |
| 124 'VCWebServiceProxyGeneratorTool', |
| 125 'VCMIDLTool', |
| 126 'VCCLCompilerTool', |
| 127 'VCManagedResourceCompilerTool', |
| 128 'VCResourceCompilerTool', |
| 129 'VCPreLinkEventTool', |
| 130 MSVSTool('VCLinkerTool', |
| 131 AdditionalDependencies='winmm.lib'), |
| 132 'VCALinkTool', |
| 133 'VCManifestTool', |
| 134 'VCXDCMakeTool', |
| 135 'VCBscMakeTool', |
| 136 'VCFxCopTool', |
| 137 'VCAppVerifierTool', |
| 138 'VCWebDeploymentTool', |
| 139 'VCPostBuildEventTool', |
| 140 ], |
| 141 ConfigurationType='1') |
| 142 |
| 143 |
| 144 p.AddConfig('Debug|Win32', |
| 145 InheritedPropertySheets=[ |
| 146 '$(SolutionDir)../build/common.vsprops', |
| 147 '$(SolutionDir)../build/debug.vsprops', |
| 148 '../../tools/build/win/precompiled_wtl.vsprops', |
| 149 '../../tools/build/win/unit_test.vsprops', |
| 150 '../../tools/build/win/ui_test.vsprops', |
| 151 '../../tools/build/win/test_memory_usage.vsprops', |
| 152 '$(SolutionDir)../skia/using_skia.vsprops', |
| 153 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 154 ]) |
| 155 |
| 156 p.AddConfig('Release|Win32', |
| 157 InheritedPropertySheets=[ |
| 158 '$(SolutionDir)../build/common.vsprops', |
| 159 '$(SolutionDir)../build/release.vsprops', |
| 160 '../../tools/build/win/unit_test.vsprops', |
| 161 '../../tools/build/win/ui_test.vsprops', |
| 162 '../../tools/build/win/test_memory_usage.vsprops', |
| 163 '$(SolutionDir)../skia/using_skia.vsprops', |
| 164 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 165 ]) |
| 166 |
| 167 p.AddFileConfig('../../tools/build/win/precompiled_wtl.cc', |
| 168 'Debug|Win32', |
| 169 tools=[ |
| 170 MSVSTool('VCCLCompilerTool', |
| 171 UsePrecompiledHeader='1'), |
| 172 ]) |
OLD | NEW |