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

Side by Side Diff: trunk/pylib/gyp/generator/xcode.py

Issue 159792: Make generators robust in the face of generator_flags being defined.... (Closed) Base URL: http://gyp.googlecode.com/svn/
Patch Set: Created 11 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 | « trunk/pylib/gyp/generator/msvs.py ('k') | 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 import filecmp 3 import filecmp
4 import gyp.common 4 import gyp.common
5 import gyp.xcodeproj_file 5 import gyp.xcodeproj_file
6 import errno 6 import errno
7 import os 7 import os
8 import posixpath 8 import posixpath
9 import re 9 import re
10 import shutil 10 import shutil
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 continue 493 continue
494 494
495 replacement = expansions[variable] 495 replacement = expansions[variable]
496 string = re.sub(re.escape(to_replace), replacement, string) 496 string = re.sub(re.escape(to_replace), replacement, string)
497 497
498 return string 498 return string
499 499
500 500
501 def GenerateOutput(target_list, target_dicts, data, params): 501 def GenerateOutput(target_list, target_dicts, data, params):
502 options = params['options'] 502 options = params['options']
503 generator_flags = params['generator_flags'] 503 generator_flags = params.get('generator_flags', {})
504 parallel_builds = generator_flags.get('xcode_parallel_builds', True) 504 parallel_builds = generator_flags.get('xcode_parallel_builds', True)
505 xcode_projects = {} 505 xcode_projects = {}
506 for build_file, build_file_dict in data.iteritems(): 506 for build_file, build_file_dict in data.iteritems():
507 (build_file_root, build_file_ext) = os.path.splitext(build_file) 507 (build_file_root, build_file_ext) = os.path.splitext(build_file)
508 if build_file_ext != '.gyp': 508 if build_file_ext != '.gyp':
509 continue 509 continue
510 xcp = XcodeProject(build_file, 510 xcp = XcodeProject(build_file,
511 build_file_root + options.suffix + '.xcodeproj', 511 build_file_root + options.suffix + '.xcodeproj',
512 build_file_dict) 512 build_file_dict)
513 xcode_projects[build_file] = xcp 513 xcode_projects[build_file] = xcp
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 1016
1017 for build_file in build_files: 1017 for build_file in build_files:
1018 xcode_projects[build_file].Finalize1(xcode_targets) 1018 xcode_projects[build_file].Finalize1(xcode_targets)
1019 1019
1020 for build_file in build_files: 1020 for build_file in build_files:
1021 xcode_projects[build_file].Finalize2(xcode_targets, 1021 xcode_projects[build_file].Finalize2(xcode_targets,
1022 xcode_target_to_target_dict) 1022 xcode_target_to_target_dict)
1023 1023
1024 for build_file in build_files: 1024 for build_file in build_files:
1025 xcode_projects[build_file].Write() 1025 xcode_projects[build_file].Write()
OLDNEW
« no previous file with comments | « trunk/pylib/gyp/generator/msvs.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698