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

Side by Side Diff: pylib/gyp/generator/msvs.py

Issue 10832322: Fixes msvs generator for projects with non-default IntermediateDirectories. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Fixes msvs generator for projects with non-default IntermediateDirectories. Created 8 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/msvs/shared_output/gyptest-shared_output.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import ntpath 6 import ntpath
7 import os 7 import os
8 import posixpath 8 import posixpath
9 import re 9 import re
10 import subprocess 10 import subprocess
(...skipping 1243 matching lines...) Expand 10 before | Expand all | Expand 10 after
1254 if vsprops_dirs: 1254 if vsprops_dirs:
1255 prepared_attrs['InheritedPropertySheets'] = ';'.join(vsprops_dirs) 1255 prepared_attrs['InheritedPropertySheets'] = ';'.join(vsprops_dirs)
1256 # Set configuration type. 1256 # Set configuration type.
1257 prepared_attrs['ConfigurationType'] = config_type 1257 prepared_attrs['ConfigurationType'] = config_type
1258 output_dir = prepared_attrs.get('OutputDirectory', 1258 output_dir = prepared_attrs.get('OutputDirectory',
1259 '$(SolutionDir)$(ConfigurationName)') 1259 '$(SolutionDir)$(ConfigurationName)')
1260 prepared_attrs['OutputDirectory'] = _FixPath(output_dir) + '\\' 1260 prepared_attrs['OutputDirectory'] = _FixPath(output_dir) + '\\'
1261 if 'IntermediateDirectory' not in prepared_attrs: 1261 if 'IntermediateDirectory' not in prepared_attrs:
1262 intermediate = '$(ConfigurationName)\\obj\\$(ProjectName)' 1262 intermediate = '$(ConfigurationName)\\obj\\$(ProjectName)'
1263 prepared_attrs['IntermediateDirectory'] = _FixPath(intermediate) + '\\' 1263 prepared_attrs['IntermediateDirectory'] = _FixPath(intermediate) + '\\'
1264 else:
1265 intermediate = _FixPath(prepared_attrs['IntermediateDirectory']) + '\\'
1266 intermediate = MSVSSettings.FixVCMacroSlashes(intermediate)
1267 prepared_attrs['IntermediateDirectory'] = intermediate
1264 return prepared_attrs 1268 return prepared_attrs
1265 1269
1266 1270
1267 def _AddNormalizedSources(sources_set, sources_array): 1271 def _AddNormalizedSources(sources_set, sources_array):
1268 sources = [_NormalizedSource(s) for s in sources_array] 1272 sources = [_NormalizedSource(s) for s in sources_array]
1269 sources_set.update(set(sources)) 1273 sources_set.update(set(sources))
1270 1274
1271 1275
1272 def _PrepareListOfSources(spec, gyp_file): 1276 def _PrepareListOfSources(spec, gyp_file):
1273 """Prepare list of sources and excluded sources. 1277 """Prepare list of sources and excluded sources.
(...skipping 1848 matching lines...) Expand 10 before | Expand all | Expand 10 after
3122 action_spec.extend( 3126 action_spec.extend(
3123 # TODO(jeanluc) 'Document' for all or just if as_sources? 3127 # TODO(jeanluc) 'Document' for all or just if as_sources?
3124 [['FileType', 'Document'], 3128 [['FileType', 'Document'],
3125 ['Command', command], 3129 ['Command', command],
3126 ['Message', description], 3130 ['Message', description],
3127 ['Outputs', outputs] 3131 ['Outputs', outputs]
3128 ]) 3132 ])
3129 if additional_inputs: 3133 if additional_inputs:
3130 action_spec.append(['AdditionalInputs', additional_inputs]) 3134 action_spec.append(['AdditionalInputs', additional_inputs])
3131 actions_spec.append(action_spec) 3135 actions_spec.append(action_spec)
OLDNEW
« no previous file with comments | « no previous file | test/msvs/shared_output/gyptest-shared_output.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698