Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2447)

Unified Diff: build/SConscript.main

Issue 9149: Adding better project generation (source and build targets).... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | site_scons/site_tools/component_targets_msvs.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
===================================================================
--- build/SConscript.main (revision 4718)
+++ build/SConscript.main (working copy)
@@ -237,6 +237,7 @@
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 @@
# 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.
# -------------------------------------------------------------------------
« no previous file with comments | « no previous file | site_scons/site_tools/component_targets_msvs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698