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

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

Issue 151102: Fixing typo down in auto vs detection. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 11 years, 5 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 2
3 3
4 import os 4 import os
5 import re 5 import re
6 import subprocess 6 import subprocess
7 import sys 7 import sys
8 import gyp.common 8 import gyp.common
9 import gyp.MSVSNew as MSVSNew 9 import gyp.MSVSNew as MSVSNew
10 import gyp.MSVSToolFile as MSVSToolFile 10 import gyp.MSVSToolFile as MSVSToolFile
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 target_dicts: Dict of target properties keyed on target pair. 835 target_dicts: Dict of target properties keyed on target pair.
836 data: Dictionary containing per .gyp data. 836 data: Dictionary containing per .gyp data.
837 """ 837 """
838 838
839 options = params['options'] 839 options = params['options']
840 generator_flags = params['generator_flags'] 840 generator_flags = params['generator_flags']
841 841
842 # Select project file format version (if unset, default to auto detecting). 842 # Select project file format version (if unset, default to auto detecting).
843 msvs_version = \ 843 msvs_version = \
844 MSVSVersion.SelectVisualStudioVersion(generator_flags.get('msvs_version', 844 MSVSVersion.SelectVisualStudioVersion(generator_flags.get('msvs_version',
845 'auto') 845 'auto'))
846 846
847 # Prepare the set of configurations. 847 # Prepare the set of configurations.
848 configs = set() 848 configs = set()
849 for qualified_target in target_list: 849 for qualified_target in target_list:
850 build_file = gyp.common.BuildFileAndTarget('', qualified_target)[0] 850 build_file = gyp.common.BuildFileAndTarget('', qualified_target)[0]
851 spec = target_dicts[qualified_target] 851 spec = target_dicts[qualified_target]
852 for config_name, c in spec['configurations'].iteritems(): 852 for config_name, c in spec['configurations'].iteritems():
853 configs.add('|'.join([config_name, 853 configs.add('|'.join([config_name,
854 c.get('configuration_platform', 'Win32')])) 854 c.get('configuration_platform', 'Win32')]))
855 configs = list(configs) 855 configs = list(configs)
(...skipping 30 matching lines...) Expand all
886 _ProjectObject(sln_path, p, project_objs, projects) 886 _ProjectObject(sln_path, p, project_objs, projects)
887 # Create folder hierarchy. 887 # Create folder hierarchy.
888 root_entries = _GatherSolutionFolders(project_objs) 888 root_entries = _GatherSolutionFolders(project_objs)
889 # Create solution. 889 # Create solution.
890 sln = MSVSNew.MSVSSolution(sln_path, 890 sln = MSVSNew.MSVSSolution(sln_path,
891 entries=root_entries, 891 entries=root_entries,
892 variants=configs, 892 variants=configs,
893 websiteProperties=False, 893 websiteProperties=False,
894 version=msvs_version) 894 version=msvs_version)
895 sln.Write() 895 sln.Write()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698