| OLD | NEW |
| 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 errno | 8 import errno |
| 9 import os | 9 import os |
| 10 import sys | 10 import sys |
| (...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 'loadable_module+bundle': 'com.apple.product-type.bundle', | 677 'loadable_module+bundle': 'com.apple.product-type.bundle', |
| 678 'shared_library+bundle': 'com.apple.product-type.framework', | 678 'shared_library+bundle': 'com.apple.product-type.framework', |
| 679 } | 679 } |
| 680 | 680 |
| 681 target_properties = { | 681 target_properties = { |
| 682 'buildConfigurationList': xccl, | 682 'buildConfigurationList': xccl, |
| 683 'name': target_name, | 683 'name': target_name, |
| 684 } | 684 } |
| 685 | 685 |
| 686 type = spec['type'] | 686 type = spec['type'] |
| 687 if type == 'standalone_static_library': |
| 688 type = 'static_library' |
| 687 is_bundle = int(spec.get('mac_bundle', 0)) | 689 is_bundle = int(spec.get('mac_bundle', 0)) |
| 688 if type != 'none': | 690 if type != 'none': |
| 689 type_bundle_key = type | 691 type_bundle_key = type |
| 690 if is_bundle: | 692 if is_bundle: |
| 691 type_bundle_key += '+bundle' | 693 type_bundle_key += '+bundle' |
| 692 xctarget_type = gyp.xcodeproj_file.PBXNativeTarget | 694 xctarget_type = gyp.xcodeproj_file.PBXNativeTarget |
| 693 try: | 695 try: |
| 694 target_properties['productType'] = _types[type_bundle_key] | 696 target_properties['productType'] = _types[type_bundle_key] |
| 695 except KeyError, e: | 697 except KeyError, e: |
| 696 gyp.common.ExceptionAppend(e, "-- unknown product type while " | 698 gyp.common.ExceptionAppend(e, "-- unknown product type while " |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1221 | 1223 |
| 1222 for build_file in build_files: | 1224 for build_file in build_files: |
| 1223 xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests) | 1225 xcode_projects[build_file].Finalize1(xcode_targets, serialize_all_tests) |
| 1224 | 1226 |
| 1225 for build_file in build_files: | 1227 for build_file in build_files: |
| 1226 xcode_projects[build_file].Finalize2(xcode_targets, | 1228 xcode_projects[build_file].Finalize2(xcode_targets, |
| 1227 xcode_target_to_target_dict) | 1229 xcode_target_to_target_dict) |
| 1228 | 1230 |
| 1229 for build_file in build_files: | 1231 for build_file in build_files: |
| 1230 xcode_projects[build_file].Write() | 1232 xcode_projects[build_file].Write() |
| OLD | NEW |