| 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 1199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1210 # If an rspfile contains spaces, ninja surrounds the filename with | 1210 # If an rspfile contains spaces, ninja surrounds the filename with |
| 1211 # quotes around it and then passes it to open(), creating a file with | 1211 # quotes around it and then passes it to open(), creating a file with |
| 1212 # quotes in its name (and when looking for the rsp file, the name | 1212 # quotes in its name (and when looking for the rsp file, the name |
| 1213 # makes it through bash which strips the quotes) :-/ | 1213 # makes it through bash which strips the quotes) :-/ |
| 1214 link_file_list = link_file_list.replace(' ', '_') | 1214 link_file_list = link_file_list.replace(' ', '_') |
| 1215 extra_bindings.append( | 1215 extra_bindings.append( |
| 1216 ('link_file_list', | 1216 ('link_file_list', |
| 1217 gyp.common.EncodePOSIXShellArgument(link_file_list))) | 1217 gyp.common.EncodePOSIXShellArgument(link_file_list))) |
| 1218 if self.flavor == 'win': | 1218 if self.flavor == 'win': |
| 1219 extra_bindings.append(('binary', output)) | 1219 extra_bindings.append(('binary', output)) |
| 1220 if '/NOENTRY' not in ldflags: | 1220 if ('/NOENTRY' not in ldflags and |
| 1221 not self.msvs_settings.GetNoImportLibrary(config_name)): |
| 1221 self.target.import_lib = output + '.lib' | 1222 self.target.import_lib = output + '.lib' |
| 1222 extra_bindings.append(('implibflag', | 1223 extra_bindings.append(('implibflag', |
| 1223 '/IMPLIB:%s' % self.target.import_lib)) | 1224 '/IMPLIB:%s' % self.target.import_lib)) |
| 1224 pdbname = self.msvs_settings.GetPDBName( | 1225 pdbname = self.msvs_settings.GetPDBName( |
| 1225 config_name, self.ExpandSpecial, output + '.pdb') | 1226 config_name, self.ExpandSpecial, output + '.pdb') |
| 1226 output = [output, self.target.import_lib] | 1227 output = [output, self.target.import_lib] |
| 1227 if pdbname: | 1228 if pdbname: |
| 1228 output.append(pdbname) | 1229 output.append(pdbname) |
| 1229 elif not self.is_mac_bundle: | 1230 elif not self.is_mac_bundle: |
| 1230 output = [output, output + '.TOC'] | 1231 output = [output, output + '.TOC'] |
| (...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2380 arglists.append( | 2381 arglists.append( |
| 2381 (target_list, target_dicts, data, params, config_name)) | 2382 (target_list, target_dicts, data, params, config_name)) |
| 2382 pool.map(CallGenerateOutputForConfig, arglists) | 2383 pool.map(CallGenerateOutputForConfig, arglists) |
| 2383 except KeyboardInterrupt, e: | 2384 except KeyboardInterrupt, e: |
| 2384 pool.terminate() | 2385 pool.terminate() |
| 2385 raise e | 2386 raise e |
| 2386 else: | 2387 else: |
| 2387 for config_name in config_names: | 2388 for config_name in config_names: |
| 2388 GenerateOutputForConfig(target_list, target_dicts, data, params, | 2389 GenerateOutputForConfig(target_list, target_dicts, data, params, |
| 2389 config_name) | 2390 config_name) |
| OLD | NEW |