OLD | NEW |
1 # Copyright (c) 2013 Google Inc. All rights reserved. | 1 # Copyright (c) 2013 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 collections | 5 import collections |
6 import copy | 6 import copy |
7 import hashlib | 7 import hashlib |
8 import json | 8 import json |
9 import multiprocessing | 9 import multiprocessing |
10 import os.path | 10 import os.path |
(...skipping 1351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1362 assert self.is_mac_bundle | 1362 assert self.is_mac_bundle |
1363 package_framework = spec['type'] in ('shared_library', 'loadable_module') | 1363 package_framework = spec['type'] in ('shared_library', 'loadable_module') |
1364 output = self.ComputeMacBundleOutput() | 1364 output = self.ComputeMacBundleOutput() |
1365 if is_empty: | 1365 if is_empty: |
1366 output += '.stamp' | 1366 output += '.stamp' |
1367 variables = [] | 1367 variables = [] |
1368 self.AppendPostbuildVariable(variables, spec, output, self.target.binary, | 1368 self.AppendPostbuildVariable(variables, spec, output, self.target.binary, |
1369 is_command_start=not package_framework) | 1369 is_command_start=not package_framework) |
1370 if package_framework and not is_empty: | 1370 if package_framework and not is_empty: |
1371 if spec['type'] == 'shared_library' and self.xcode_settings.isIOS: | 1371 if spec['type'] == 'shared_library' and self.xcode_settings.isIOS: |
1372 self.ninja.build(output, 'package_ios_framework', mac_bundle_depends) | 1372 self.ninja.build(output, 'package_ios_framework', mac_bundle_depends, |
| 1373 variables=variables) |
1373 else: | 1374 else: |
1374 variables.append(('version', self.xcode_settings.GetFrameworkVersion())) | 1375 variables.append(('version', self.xcode_settings.GetFrameworkVersion())) |
1375 self.ninja.build(output, 'package_framework', mac_bundle_depends, | 1376 self.ninja.build(output, 'package_framework', mac_bundle_depends, |
1376 variables=variables) | 1377 variables=variables) |
1377 else: | 1378 else: |
1378 self.ninja.build(output, 'stamp', mac_bundle_depends, | 1379 self.ninja.build(output, 'stamp', mac_bundle_depends, |
1379 variables=variables) | 1380 variables=variables) |
1380 self.target.bundle = output | 1381 self.target.bundle = output |
1381 return output | 1382 return output |
1382 | 1383 |
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2466 arglists.append( | 2467 arglists.append( |
2467 (target_list, target_dicts, data, params, config_name)) | 2468 (target_list, target_dicts, data, params, config_name)) |
2468 pool.map(CallGenerateOutputForConfig, arglists) | 2469 pool.map(CallGenerateOutputForConfig, arglists) |
2469 except KeyboardInterrupt, e: | 2470 except KeyboardInterrupt, e: |
2470 pool.terminate() | 2471 pool.terminate() |
2471 raise e | 2472 raise e |
2472 else: | 2473 else: |
2473 for config_name in config_names: | 2474 for config_name in config_names: |
2474 GenerateOutputForConfig(target_list, target_dicts, data, params, | 2475 GenerateOutputForConfig(target_list, target_dicts, data, params, |
2475 config_name) | 2476 config_name) |
OLD | NEW |