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

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

Issue 1485103002: Fix CalculateGeneratorInputInfo for "xcode-ninja" generator. (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Created 5 years 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
« 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 # 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 filecmp 5 import filecmp
6 import gyp.common 6 import gyp.common
7 import gyp.xcodeproj_file 7 import gyp.xcodeproj_file
8 import gyp.xcode_ninja 8 import gyp.xcode_ninja
9 import errno 9 import errno
10 import os 10 import os
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 generator_dir = os.path.relpath(params['options'].generator_output or '.') 586 generator_dir = os.path.relpath(params['options'].generator_output or '.')
587 output_dir = params.get('generator_flags', {}).get('output_dir', 'out') 587 output_dir = params.get('generator_flags', {}).get('output_dir', 'out')
588 output_dir = os.path.normpath(os.path.join(generator_dir, output_dir)) 588 output_dir = os.path.normpath(os.path.join(generator_dir, output_dir))
589 qualified_out_dir = os.path.normpath(os.path.join( 589 qualified_out_dir = os.path.normpath(os.path.join(
590 toplevel, output_dir, 'gypfiles-xcode-ninja')) 590 toplevel, output_dir, 'gypfiles-xcode-ninja'))
591 else: 591 else:
592 output_dir = os.path.normpath(os.path.join(toplevel, 'xcodebuild')) 592 output_dir = os.path.normpath(os.path.join(toplevel, 'xcodebuild'))
593 qualified_out_dir = os.path.normpath(os.path.join( 593 qualified_out_dir = os.path.normpath(os.path.join(
594 toplevel, output_dir, 'gypfiles')) 594 toplevel, output_dir, 'gypfiles'))
595 595
596 global generator_filelist_paths 596 global generator_filelist_paths
597 generator_filelist_paths = { 597 generator_filelist_paths = {
598 'toplevel': toplevel, 598 'toplevel': toplevel,
599 'qualified_out_dir': qualified_out_dir, 599 'qualified_out_dir': qualified_out_dir,
600 } 600 }
601 601
602 602
603 def GenerateOutput(target_list, target_dicts, data, params): 603 def GenerateOutput(target_list, target_dicts, data, params):
604 # Optionally configure each spec to use ninja as the external builder. 604 # Optionally configure each spec to use ninja as the external builder.
605 ninja_wrapper = params.get('flavor') == 'ninja' 605 ninja_wrapper = params.get('flavor') == 'ninja'
606 if ninja_wrapper: 606 if ninja_wrapper:
607 (target_list, target_dicts, data) = \ 607 (target_list, target_dicts, data) = \
608 gyp.xcode_ninja.CreateWrapper(target_list, target_dicts, data, params) 608 gyp.xcode_ninja.CreateWrapper(target_list, target_dicts, data, params)
609 609
610 options = params['options'] 610 options = params['options']
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 1291
1292 for build_file in build_files: 1292 for build_file in build_files:
1293 xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests) 1293 xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests)
1294 1294
1295 for build_file in build_files: 1295 for build_file in build_files:
1296 xcode_projects[build_file].Finalize2(xcode_targets, 1296 xcode_projects[build_file].Finalize2(xcode_targets,
1297 xcode_target_to_target_dict) 1297 xcode_target_to_target_dict)
1298 1298
1299 for build_file in build_files: 1299 for build_file in build_files:
1300 xcode_projects[build_file].Write() 1300 xcode_projects[build_file].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