Index: pylib/gyp/generator/msvs.py |
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py |
index 2d2c379b5bb58e80916da181a8df31deacb8ddaf..cabc5a69343cd7043d9e3c8023ce5329c543e086 100644 |
--- a/pylib/gyp/generator/msvs.py |
+++ b/pylib/gyp/generator/msvs.py |
@@ -904,7 +904,7 @@ def _GenerateMSVSProject(project, options, version, generator_flags): |
_AddToolFilesToMSVS(p, spec) |
_HandlePreCompiledHeaders(p, sources, spec) |
- _AddActions(actions_to_add, spec, relative_path_of_gyp_file, project.path) |
+ _AddActions(actions_to_add, spec, relative_path_of_gyp_file) |
_AddCopies(actions_to_add, spec) |
_WriteMSVSUserFile(project.path, version, spec) |
@@ -1440,19 +1440,7 @@ def _HandlePreCompiledHeaders(p, sources, spec): |
DisableForSourceTree(sources) |
-def _WriteFileIfChanged(filename, data): |
- if os.path.exists(filename): |
- fh = open(filename, 'r') |
- old_data = fh.read() |
- fh.close() |
- if old_data == data: |
- return |
- fh = open(filename, 'w') |
- fh.write(data) |
- fh.close() |
- |
- |
-def _AddActions(actions_to_add, spec, relative_path_of_gyp_file, vcproj_file): |
+def _AddActions(actions_to_add, spec, relative_path_of_gyp_file): |
# Add actions. |
actions = spec.get('actions', []) |
# Don't setup_env every time. When all the actions are run together in one |
@@ -1468,14 +1456,6 @@ def _AddActions(actions_to_add, spec, relative_path_of_gyp_file, vcproj_file): |
cmd = _BuildCommandLineForRule(spec, a, has_input_path=False, |
do_setup_env=need_setup_env) |
have_setup_env.add(attached_to) |
- if vcproj_file: |
- # Additionally, on MSVS 2008, we record the command in a file |
- # and add this as a dependency so that when the command changes, |
- # the action gets re-run. This is not necessary on MSVS 2010 |
- # which tracks command changes for us. |
- command_file = '%s_%s.gypcmd' % (vcproj_file, a['action_name']) |
- _WriteFileIfChanged(command_file, cmd) |
- inputs = inputs + [os.path.basename(command_file)] |
# Add the action. |
_AddActionStep(actions_to_add, |
inputs=inputs, |
@@ -2963,6 +2943,9 @@ def _GenerateMSBuildProject(project, options, version, generator_flags): |
if msbuildproj_dir and not os.path.exists(msbuildproj_dir): |
os.makedirs(msbuildproj_dir) |
# Prepare list of sources and excluded sources. |
+ gyp_path = _NormalizedSource(project.build_file) |
+ relative_path_of_gyp_file = gyp.common.RelativePath(gyp_path, project_dir) |
+ |
gyp_file = os.path.split(project.build_file)[1] |
sources, excluded_sources = _PrepareListOfSources(spec, gyp_file) |
# Add rules. |
@@ -2980,7 +2963,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags): |
project_dir, sources, |
excluded_sources, |
list_excluded)) |
- _AddActions(actions_to_add, spec, project.build_file, None) |
+ _AddActions(actions_to_add, spec, project.build_file) |
_AddCopies(actions_to_add, spec) |
# NOTE: this stanza must appear after all actions have been decided. |