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

Unified Diff: site_scons/site_tools/component_targets_msvs.py

Issue 9184: Unrollback the Scons changes, they weren't the cause of the problem. (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 | « build/SConscript.main ('k') | site_scons/site_tools/visual_studio_solution.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: site_scons/site_tools/component_targets_msvs.py
===================================================================
--- site_scons/site_tools/component_targets_msvs.py (revision 4781)
+++ site_scons/site_tools/component_targets_msvs.py (working copy)
@@ -105,8 +105,10 @@
project_file = target[0].path
project_to_main = env.RelativePath(target[0].dir, env.Dir('$MAIN_DIR'),
sep='/')
- hammer_bat = '$(ProjectDir)/%s/hammer.bat' % project_to_main
+ env_hammer_bat = env.Clone(VS_PROJECT_TO_MAIN_DIR=project_to_main)
+ hammer_bat = env_hammer_bat.subst('$COMPONENT_VS_PROJECT_SCRIPT_PATH', raw=1)
+
# Project header
xml_impl = xml.dom.getDOMImplementation()
doc = xml_impl.createDocument(None, 'VisualStudioProject', None)
@@ -433,6 +435,10 @@
COMPONENT_VS_PROJECT_DIR='$COMPONENT_VS_SOLUTION_DIR/projects',
COMPONENT_VS_SOLUTION_SUFFIX='.sln',
COMPONENT_VS_PROJECT_SUFFIX='.vcproj',
+ COMPONENT_VS_PROJECT_SCRIPT_NAME = 'hammer.bat',
+ COMPONENT_VS_PROJECT_SCRIPT_PATH = (
+ '$$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR/'
+ '$COMPONENT_VS_PROJECT_SCRIPT_NAME'),
)
AddTargetGroup('all_solutions', 'solutions can be built')
@@ -441,6 +447,7 @@
vcprojaction = SCons.Script.Action(ComponentVSProjectBuilder, varlist=[
'TARGET_NAME',
'TARGET_PATH',
+ 'COMPONENT_VS_PROJECT_SCRIPT_PATH',
])
vcprojbuilder = SCons.Script.Builder(
action=vcprojaction,
« no previous file with comments | « build/SConscript.main ('k') | site_scons/site_tools/visual_studio_solution.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698