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

Unified Diff: build/SConscript.main

Issue 9259: Adding visual studio solution files.... (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 | build/SConscript.v8 » ('j') | site_scons/site_tools/visual_studio_solution.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
===================================================================
--- build/SConscript.main (revision 4521)
+++ build/SConscript.main (working copy)
@@ -85,7 +85,12 @@
root_env.Append(LIBPATH = ['$V8_DIR'])
+# Declare a bit to gate solution generation.
+# The actual generation must be at the end.
+DeclareBit('solution', 'Generate a solution file')
+root_env.SetBitFromOption('solution', False)
+
def ChromeProgram(env, *args, **kw):
return env.ComponentProgram(*args, **kw)
root_env.AddMethod(ChromeProgram)
@@ -183,7 +188,10 @@
if LoadComponent('rlz'):
sconscripts.append('$RLZ_DIR/SConscript')
-if LoadComponent('sandbox'):
+# TODO(bradnelson): fix solution generation for sandbox.
+# The solution generator blows up on some of the tests in sandbox.
+# For now, disable sandbox for solution generation.
+if LoadComponent('sandbox') and not root_env.Bit('solution'):
sconscripts.append('$SANDBOX_DIR/sandbox.scons')
if LoadComponent('sdch'):
@@ -211,7 +219,7 @@
])
if LoadComponent('v8') and root_env.Dir('$CHROME_SRC_DIR/v8').exists():
- sconscripts.append('build/SConscript.v8')
+ sconscripts.append('$OBJ_ROOT/build/SConscript.v8')
if LoadComponent('webkit'):
sconscripts.append('$WEBKIT_DIR/SConscript')
@@ -233,8 +241,8 @@
windows_env.Replace(
BUILD_TYPE = 'debug-windows',
BUILD_TYPE_DESCRIPTION = 'Windows debug build',
- BUILD_GROUPS = ['default'],
)
+windows_env.Append(BUILD_GROUPS = ['default'])
# TODO(bradnelson): this is needed for now because target_platform_windows
# has OS_WINDOWS defined in a weird way.
@@ -401,8 +409,8 @@
linux_env.Replace(
BUILD_TYPE = 'debug-linux',
BUILD_TYPE_DESCRIPTION = 'Linux debug build',
- BUILD_GROUPS = ['default'],
)
+linux_env.Append(BUILD_GROUPS = ['default'])
# TODO(bradnelson): this is needed for now because target_platform_linux has
@@ -503,8 +511,8 @@
mac_env.Replace(
BUILD_TYPE = 'debug-mac',
BUILD_TYPE_DESCRIPTION = 'Mac debug build',
- BUILD_GROUPS = ['default'],
)
+mac_env.Append(BUILD_GROUPS = ['default'])
mac_env.Replace(
# Reproduce XCode's behavior of using gcc even to link C++,
@@ -640,3 +648,16 @@
BuildComponents(environment_list)
# -------------------------------------------------------------------------
+
+# This must occur after BuildComponents so that the dependency graph
+# 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],
+ exclude_pattern = '.*(Program Files|platformsdk_vista_6_0|cygwin).*',
+ )
+ Default(None) # Delete all other default targets.
+ Default(solution) # Build just the solution.
+
+# -------------------------------------------------------------------------
« no previous file with comments | « no previous file | build/SConscript.v8 » ('j') | site_scons/site_tools/visual_studio_solution.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698