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