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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 '/nxcompat', | 44 '/nxcompat', |
45 ], | 45 ], |
46 LIBS = [ | 46 LIBS = [ |
47 'comsupp', | 47 'comsupp', |
48 'oleacc', | 48 'oleacc', |
49 'rpcrt4', | 49 'rpcrt4', |
50 'shlwapi', | 50 'shlwapi', |
51 ], | 51 ], |
52 ) | 52 ) |
53 | 53 |
54 input_files = [ | 54 input_files = ChromeFileList([ |
55 '../setup/setup_constants$OBJSUFFIX', | 55 # TODO(sgk): violate standard indentation so we don't have to |
| 56 # reindent too much when we remove the explicit MSVSFilter() calls |
| 57 # in favor of generating the hierarchy to reflect the file system. |
| 58 MSVSFilter('support', [ |
| 59 'run_all_unittests.cc', |
| 60 ]), |
| 61 MSVSFilter('tests', [ |
56 'copy_tree_work_item_unittest.cc', | 62 'copy_tree_work_item_unittest.cc', |
57 'create_dir_work_item_unittest.cc', | 63 'create_dir_work_item_unittest.cc', |
58 'create_reg_key_work_item_unittest.cc', | 64 'create_reg_key_work_item_unittest.cc', |
59 'delete_reg_value_work_item_unittest.cc', | 65 'delete_reg_value_work_item_unittest.cc', |
60 'delete_tree_work_item_unittest.cc', | 66 'delete_tree_work_item_unittest.cc', |
| 67 'helper_unittest.cc', |
61 'google_chrome_distribution_unittest.cc', | 68 'google_chrome_distribution_unittest.cc', |
62 'helper_unittest.cc', | |
63 'run_all_unittests.cc', | |
64 'set_reg_value_work_item_unittest.cc', | 69 'set_reg_value_work_item_unittest.cc', |
| 70 '../setup/setup_constants$OBJSUFFIX', |
65 'work_item_list_unittest.cc', | 71 'work_item_list_unittest.cc', |
66 ] | 72 ]), |
| 73 ]) |
| 74 |
67 | 75 |
68 # TODO(port): | 76 # TODO(port): |
69 if env.Bit('windows'): | 77 if env.Bit('windows'): |
70 env.ChromeTestProgram('installer_unittests', input_files) | 78 env.ChromeTestProgram('installer_unittests', input_files) |
| 79 |
| 80 p = env.ChromeMSVSProject('installer_unittests.vcproj', |
| 81 dest=('$CHROME_SRC_DIR/chrome/' |
| 82 + 'installer/util/installer_unittests.vcproj'), |
| 83 guid='{903F8C1E-537A-4C9E-97BE-075147CBE769}', |
| 84 dependencies = [ |
| 85 '$BASE_DIR/build/base.vcproj', |
| 86 '$CHROME_DIR/common/common.vcproj', |
| 87 '$ICU38_DIR/build/icu.vcproj', |
| 88 '$TESTING_DIR/gtest.vcproj', |
| 89 '$CHROME_DIR/installer/util/util.vcproj', |
| 90 ], |
| 91 # TODO(sgk): when we can intuit the hierarchy |
| 92 # from the built targets. |
| 93 #buildtargets=TODO, |
| 94 files=input_files, |
| 95 tools=[ |
| 96 'VCPreBuildEventTool', |
| 97 'VCCustomBuildTool', |
| 98 'VCXMLDataGeneratorTool', |
| 99 'VCWebServiceProxyGeneratorTool', |
| 100 'VCMIDLTool', |
| 101 'VCCLCompilerTool', |
| 102 'VCManagedResourceCompilerTool', |
| 103 'VCResourceCompilerTool', |
| 104 'VCPreLinkEventTool', |
| 105 'VCLinkerTool', |
| 106 'VCALinkTool', |
| 107 MSVSTool('VCManifestTool', |
| 108 AdditionalManifestFiles=( |
| 109 '$(SolutionDir)installer/' |
| 110 + 'mini_installer/' |
| 111 + 'mini_installer.exe.manifest')), |
| 112 'VCXDCMakeTool', |
| 113 'VCBscMakeTool', |
| 114 'VCFxCopTool', |
| 115 'VCAppVerifierTool', |
| 116 'VCWebDeploymentTool', |
| 117 'VCPostBuildEventTool', |
| 118 ], |
| 119 ConfigurationType='1') |
| 120 |
| 121 |
| 122 p.AddConfig('Debug|Win32', |
| 123 InheritedPropertySheets=[ |
| 124 '$(SolutionDir)../build/common.vsprops', |
| 125 '$(SolutionDir)../build/debug.vsprops', |
| 126 '$(SolutionDir)/tools/build/win/unit_test.vsprops', |
| 127 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 128 ]) |
| 129 |
| 130 p.AddConfig('Release|Win32', |
| 131 InheritedPropertySheets=[ |
| 132 '$(SolutionDir)../build/common.vsprops', |
| 133 '$(SolutionDir)../build/release.vsprops', |
| 134 '$(SolutionDir)/tools/build/win/unit_test.vsprops', |
| 135 '$(SolutionDir)../testing/using_gtest.vsprops', |
| 136 ]) |
OLD | NEW |