summaryrefslogtreecommitdiffstats
path: root/site_scons
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-04 00:32:42 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-04 00:32:42 +0000
commit98c01eda0df03da5b7a611edc5698b1ebb075967 (patch)
tree179022d266994ace1560479bf304143ab1cab772 /site_scons
parentfc2cdc1f00430d3dbfccc849b3053311e385fabb (diff)
downloadchromium_src-98c01eda0df03da5b7a611edc5698b1ebb075967.zip
chromium_src-98c01eda0df03da5b7a611edc5698b1ebb075967.tar.gz
chromium_src-98c01eda0df03da5b7a611edc5698b1ebb075967.tar.bz2
Adding visual studio solution files.
Sandbox is currently having a problem with this so it is disabled. Fixed a few stray items. Review URL: http://codereview.chromium.org/9259 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4525 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'site_scons')
-rw-r--r--site_scons/site_tools/visual_studio_solution.py27
1 files changed, 13 insertions, 14 deletions
diff --git a/site_scons/site_tools/visual_studio_solution.py b/site_scons/site_tools/visual_studio_solution.py
index 9cb9a4a..eae83fd 100644
--- a/site_scons/site_tools/visual_studio_solution.py
+++ b/site_scons/site_tools/visual_studio_solution.py
@@ -71,7 +71,7 @@ def Solution(env, solution_name,
build_targets = [e.subst('$TARGET_ROOT') for e in environments]
# pick out sources, headers, and resources
sources, headers, resources, others = env.GatherInputs(
- [SCons.Script.Dir('.')],
+ env.Dir('$DESTINATION_ROOT'),
['.+\\.(c|cc|m|mm|cpp)$', # source files
'.+\\.(h|hh|hpp)$', # header files
'.+\\.(rc)$', # resource files
@@ -79,19 +79,18 @@ def Solution(env, solution_name,
exclude_pattern=exclude_pattern,
)
# Build main Visual Studio Project file
- project_list = env.MSVSProject(target=solution_name +
- env['MSVSPROJECTSUFFIX'],
- srcs=sources + headers + others + resources,
- incs=[],
- misc=[],
- resources=[],
- auto_build_solution=0,
- MSVSCLEANCOM='hammer.bat -c MODE=all',
- MSVSBUILDCOM='hammer.bat MODE=all',
- MSVSREBUILD='hammer.bat -c MODE=all;'
- 'hammer.bat MODE=all',
- buildtarget=build_targets,
- variant=variants)
+ project_list = env.MSVSProject(
+ target=solution_name + env['MSVSPROJECTSUFFIX'],
+ srcs=sources + headers + others + resources,
+ incs=[],
+ misc=[],
+ resources=[],
+ auto_build_solution=0,
+ MSVSCLEANCOM='hammer.bat -c MODE=all',
+ MSVSBUILDCOM='hammer.bat MODE=all',
+ MSVSREBUILD='hammer.bat -c MODE=all; hammer.bat MODE=all',
+ buildtarget=build_targets,
+ variant=variants)
# Collect other projects
for e in extra_build_targets:
# Explicitly create a node for target, so SCons will expand env variables.