| 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 base_unittests{,.exe}. | 6 Configuration for building base_unittests{,.exe}. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 | 161 |
| 162 if env.Bit('mac'): | 162 if env.Bit('mac'): |
| 163 # Mac-specific tests. | 163 # Mac-specific tests. |
| 164 input_files.Extend([ | 164 input_files.Extend([ |
| 165 'mac_util_unittest.cc', | 165 'mac_util_unittest.cc', |
| 166 ]) | 166 ]) |
| 167 | 167 |
| 168 env.ChromeTestProgram('base_unittests', input_files) | 168 env.ChromeTestProgram('base_unittests', input_files) |
| 169 | 169 |
| 170 p = env.ChromeMSVSProject('build/base_unittests.vcproj', | 170 p = env.ChromeMSVSProject('build/base_unittests.vcproj', |
| 171 dest='$CHROME_SRC_DIR/base/build/base_unittests.vcproj
', |
| 171 guid='{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}', | 172 guid='{27A30967-4BBA-48D1-8522-CDE95F7B1CEC}', |
| 172 dependencies=[ | 173 dependencies=[ |
| 173 '$BASE_DIR/build/base.vcproj', | 174 '$BASE_DIR/build/base.vcproj', |
| 174 '$ZLIB_DIR/zlib.vcproj', | 175 '$ZLIB_DIR/zlib.vcproj', |
| 175 '$ICU38_DIR/build/icu.vcproj', | 176 '$ICU38_DIR/build/icu.vcproj', |
| 176 '$BASE_DIR/build/base_gfx.vcproj', | 177 '$BASE_DIR/build/base_gfx.vcproj', |
| 177 '$TESTING_DIR/gtest.vcproj', | 178 '$TESTING_DIR/gtest.vcproj', |
| 178 '$LIBPNG_DIR/libpng.vcproj', | 179 '$LIBPNG_DIR/libpng.vcproj', |
| 179 '$SKIA_DIR/skia.vcproj', | 180 '$SKIA_DIR/skia.vcproj', |
| 180 ], | 181 ], |
| (...skipping 29 matching lines...) Expand all Loading... |
| 210 ]) | 211 ]) |
| 211 | 212 |
| 212 p.AddConfig('Release|Win32', | 213 p.AddConfig('Release|Win32', |
| 213 ConfigurationType = '1', | 214 ConfigurationType = '1', |
| 214 InheritedPropertySheets = [ | 215 InheritedPropertySheets = [ |
| 215 '$(SolutionDir)../build/release.vsprops', | 216 '$(SolutionDir)../build/release.vsprops', |
| 216 './base_unittests.vsprops', | 217 './base_unittests.vsprops', |
| 217 '$(SolutionDir)../testing/using_gtest.vsprops', | 218 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 218 ]) | 219 ]) |
| 219 | 220 |
| 220 env.AlwaysBuild(p) | |
| 221 | |
| 222 i = env.Command('$CHROME_SRC_DIR/base/build/base_unittests.vcproj', p, | |
| 223 Copy('$TARGET', '$SOURCE')) | |
| 224 Alias('msvs', i) | |
| 225 | |
| 226 # TODO(sgk) should this be moved into base.lib like everything else? This will | 221 # TODO(sgk) should this be moved into base.lib like everything else? This will |
| 227 # require updating a bunch of other SConscripts which link directly against | 222 # require updating a bunch of other SConscripts which link directly against |
| 228 # this generated object file. | 223 # this generated object file. |
| 229 env.StaticObject('perftimer.cc') | 224 env.StaticObject('perftimer.cc') |
| 230 | 225 |
| 231 # Since run_all_perftests supplies a main, we cannot have it in base.lib | 226 # Since run_all_perftests supplies a main, we cannot have it in base.lib |
| 232 env.StaticObject('run_all_perftests.cc') | 227 env.StaticObject('run_all_perftests.cc') |
| OLD | NEW |