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

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

Issue 9424030: Fix test/product broken at r1211 (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 10 months 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 | Annotate | Revision Log
« 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 copy 5 import copy
6 import gyp 6 import gyp
7 import gyp.common 7 import gyp.common
8 import gyp.system_test 8 import gyp.system_test
9 import gyp.xcode_emulation 9 import gyp.xcode_emulation
10 import os.path 10 import os.path
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 prefix = spec.get('product_prefix', DEFAULT_PREFIX.get(type, '')) 845 prefix = spec.get('product_prefix', DEFAULT_PREFIX.get(type, ''))
846 846
847 # Compute filename extension: the product extension, or a default 847 # Compute filename extension: the product extension, or a default
848 # for the product type. 848 # for the product type.
849 DEFAULT_EXTENSION = { 849 DEFAULT_EXTENSION = {
850 'loadable_module': default_variables['SHARED_LIB_SUFFIX'], 850 'loadable_module': default_variables['SHARED_LIB_SUFFIX'],
851 'shared_library': default_variables['SHARED_LIB_SUFFIX'], 851 'shared_library': default_variables['SHARED_LIB_SUFFIX'],
852 'static_library': default_variables['STATIC_LIB_SUFFIX'], 852 'static_library': default_variables['STATIC_LIB_SUFFIX'],
853 'executable': default_variables['EXECUTABLE_SUFFIX'], 853 'executable': default_variables['EXECUTABLE_SUFFIX'],
854 } 854 }
855 extension = spec.get('product_extension', 855 extension = spec.get('product_extension')
856 DEFAULT_EXTENSION.get(type, '')) 856 if extension:
Nico 2012/02/20 05:31:20 Maybe extension = '.' + spec.get('product_extensi
857 extension = '.' + extension
858 else:
859 extension = DEFAULT_EXTENSION.get(type, '')
857 860
858 if 'product_name' in spec: 861 if 'product_name' in spec:
859 # If we were given an explicit name, use that. 862 # If we were given an explicit name, use that.
860 target = spec['product_name'] 863 target = spec['product_name']
861 else: 864 else:
862 # Otherwise, derive a name from the target name. 865 # Otherwise, derive a name from the target name.
863 target = spec['target_name'] 866 target = spec['target_name']
864 if prefix == 'lib': 867 if prefix == 'lib':
865 # Snip out an extra 'lib' from libs if appropriate. 868 # Snip out an extra 'lib' from libs if appropriate.
866 target = StripPrefix(target, 'lib') 869 target = StripPrefix(target, 'lib')
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 1247
1245 user_config = params.get('generator_flags', {}).get('config', None) 1248 user_config = params.get('generator_flags', {}).get('config', None)
1246 if user_config: 1249 if user_config:
1247 GenerateOutputForConfig(target_list, target_dicts, data, params, 1250 GenerateOutputForConfig(target_list, target_dicts, data, params,
1248 user_config) 1251 user_config)
1249 else: 1252 else:
1250 config_names = target_dicts[target_list[0]]['configurations'].keys() 1253 config_names = target_dicts[target_list[0]]['configurations'].keys()
1251 for config_name in config_names: 1254 for config_name in config_names:
1252 GenerateOutputForConfig(target_list, target_dicts, data, params, 1255 GenerateOutputForConfig(target_list, target_dicts, data, params,
1253 config_name) 1256 config_name)
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