| 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 gyp | 5 import gyp |
| 6 import gyp.common | 6 import gyp.common |
| 7 import gyp.system_test | 7 import gyp.system_test |
| 8 import gyp.xcode_emulation | 8 import gyp.xcode_emulation |
| 9 import os.path | 9 import os.path |
| 10 import re | 10 import re |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 self.GypPathToNinja) | 686 self.GypPathToNinja) |
| 687 else: | 687 else: |
| 688 ldflags = config.get('ldflags', []) | 688 ldflags = config.get('ldflags', []) |
| 689 self.WriteVariableList('ldflags', | 689 self.WriteVariableList('ldflags', |
| 690 gyp.common.uniquer(map(self.ExpandSpecial, | 690 gyp.common.uniquer(map(self.ExpandSpecial, |
| 691 ldflags))) | 691 ldflags))) |
| 692 | 692 |
| 693 libraries = gyp.common.uniquer(map(self.ExpandSpecial, | 693 libraries = gyp.common.uniquer(map(self.ExpandSpecial, |
| 694 spec.get('libraries', []))) | 694 spec.get('libraries', []))) |
| 695 if self.flavor == 'mac': | 695 if self.flavor == 'mac': |
| 696 libraries = self.xcode_settings.AdjustFrameworkLibraries(libraries) | 696 libraries = self.xcode_settings.AdjustLibraries(libraries) |
| 697 self.WriteVariableList('libs', libraries) | 697 self.WriteVariableList('libs', libraries) |
| 698 | 698 |
| 699 extra_bindings = [] | 699 extra_bindings = [] |
| 700 if command in ('solink', 'solink_module'): | 700 if command in ('solink', 'solink_module'): |
| 701 extra_bindings.append(('soname', os.path.split(output)[1])) | 701 extra_bindings.append(('soname', os.path.split(output)[1])) |
| 702 | 702 |
| 703 self.ninja.build(output, command, link_deps, | 703 self.ninja.build(output, command, link_deps, |
| 704 implicit=list(implicit_deps), | 704 implicit=list(implicit_deps), |
| 705 variables=extra_bindings) | 705 variables=extra_bindings) |
| 706 return output | 706 return output |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1114 | 1114 |
| 1115 user_config = params.get('generator_flags', {}).get('config', None) | 1115 user_config = params.get('generator_flags', {}).get('config', None) |
| 1116 if user_config: | 1116 if user_config: |
| 1117 GenerateOutputForConfig(target_list, target_dicts, data, params, | 1117 GenerateOutputForConfig(target_list, target_dicts, data, params, |
| 1118 user_config) | 1118 user_config) |
| 1119 else: | 1119 else: |
| 1120 config_names = target_dicts[target_list[0]]['configurations'].keys() | 1120 config_names = target_dicts[target_list[0]]['configurations'].keys() |
| 1121 for config_name in config_names: | 1121 for config_name in config_names: |
| 1122 GenerateOutputForConfig(target_list, target_dicts, data, params, | 1122 GenerateOutputForConfig(target_list, target_dicts, data, params, |
| 1123 config_name) | 1123 config_name) |
| OLD | NEW |