diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 02:37:37 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-05 02:37:37 +0000 |
| commit | ee7dee9d799e82617b75da1a95ac365dc34f4e66 (patch) | |
| tree | 7d5c71cd1942680e9db29998b64f025b551081df /build | |
| parent | 38beb36adc653c9b2da278eb9e12bc7c3f8bb7b0 (diff) | |
| download | chromium_src-ee7dee9d799e82617b75da1a95ac365dc34f4e66.zip chromium_src-ee7dee9d799e82617b75da1a95ac365dc34f4e66.tar.gz chromium_src-ee7dee9d799e82617b75da1a95ac365dc34f4e66.tar.bz2 | |
Adding better project generation (source and build targets).
Adding fix to targets_msvs to work with chrome hammer.bat in depot_tools.
Review URL: http://codereview.chromium.org/9149
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 8e10aab..5618396 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -237,6 +237,7 @@ windows_env = root_env.Clone() environment_list.append(windows_env) windows_env.Tool('target_platform_windows') windows_env.Tool('target_debug') +windows_env.Tool('component_targets_msvs') # Per target project support. windows_env.Tool('midl') windows_env.Replace( BUILD_TYPE = 'debug-windows', @@ -654,11 +655,25 @@ BuildComponents(environment_list) # will be populated. if root_env.Bit('solution'): solution_env = root_env.Clone(tools = ['visual_studio_solution']) - solution = solution_env.Solution( - '$MAIN_DIR/chrome_scons', [windows_env], + src_solution = solution_env.Solution( + '$MAIN_DIR/chrome_scons_src', [windows_env], exclude_pattern = '.*(Program Files|platformsdk_vista_6_0|cygwin).*', ) + + solution = windows_env.ComponentVSSolution('chrome_scons', + [ + 'all_libraries', + 'all_programs', + 'all_test_programs', + ], + projects = [windows_env.File('$MAIN_DIR/chrome_scons_src.vcproj')], + COMPONENT_VS_SOLUTION_DIR='$MAIN_DIR', + COMPONENT_VS_PROJECT_DIR='$MAIN_DIR/projects', + COMPONENT_VS_PROJECT_SCRIPT_PATH=( + 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), + ) + Default(None) # Delete all other default targets. - Default(solution) # Build just the solution. + Default([src_solution, solution]) # Build just the solution. # ------------------------------------------------------------------------- |