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

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

Issue 9425055: Allow override of OS variable on Windows ninja. (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.msvs_emulation 8 import gyp.msvs_emulation
9 import gyp.system_test 9 import gyp.system_test
10 import gyp.xcode_emulation 10 import gyp.xcode_emulation
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
984 global generator_additional_non_configuration_keys 984 global generator_additional_non_configuration_keys
985 generator_additional_non_configuration_keys = getattr(xcode_generator, 985 generator_additional_non_configuration_keys = getattr(xcode_generator,
986 'generator_additional_non_configuration_keys', []) 986 'generator_additional_non_configuration_keys', [])
987 global generator_additional_path_sections 987 global generator_additional_path_sections
988 generator_additional_path_sections = getattr(xcode_generator, 988 generator_additional_path_sections = getattr(xcode_generator,
989 'generator_additional_path_sections', []) 989 'generator_additional_path_sections', [])
990 global generator_extra_sources_for_rules 990 global generator_extra_sources_for_rules
991 generator_extra_sources_for_rules = getattr(xcode_generator, 991 generator_extra_sources_for_rules = getattr(xcode_generator,
992 'generator_extra_sources_for_rules', []) 992 'generator_extra_sources_for_rules', [])
993 elif flavor == 'win': 993 elif flavor == 'win':
994 default_variables['OS'] = 'win' 994 default_variables.setdefault('OS', 'win')
995 default_variables['EXECUTABLE_SUFFIX'] = '.exe' 995 default_variables['EXECUTABLE_SUFFIX'] = '.exe'
996 default_variables['STATIC_LIB_PREFIX'] = '' 996 default_variables['STATIC_LIB_PREFIX'] = ''
997 default_variables['STATIC_LIB_SUFFIX'] = '.lib' 997 default_variables['STATIC_LIB_SUFFIX'] = '.lib'
998 default_variables['SHARED_LIB_PREFIX'] = '' 998 default_variables['SHARED_LIB_PREFIX'] = ''
999 default_variables['SHARED_LIB_SUFFIX'] = '.dll' 999 default_variables['SHARED_LIB_SUFFIX'] = '.dll'
1000 else: 1000 else:
1001 operating_system = flavor 1001 operating_system = flavor
1002 if flavor == 'android': 1002 if flavor == 'android':
1003 operating_system = 'linux' # Keep this legacy behavior for now. 1003 operating_system = 'linux' # Keep this legacy behavior for now.
1004 default_variables.setdefault('OS', operating_system) 1004 default_variables.setdefault('OS', operating_system)
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 1252
1253 user_config = params.get('generator_flags', {}).get('config', None) 1253 user_config = params.get('generator_flags', {}).get('config', None)
1254 if user_config: 1254 if user_config:
1255 GenerateOutputForConfig(target_list, target_dicts, data, params, 1255 GenerateOutputForConfig(target_list, target_dicts, data, params,
1256 user_config) 1256 user_config)
1257 else: 1257 else:
1258 config_names = target_dicts[target_list[0]]['configurations'].keys() 1258 config_names = target_dicts[target_list[0]]['configurations'].keys()
1259 for config_name in config_names: 1259 for config_name in config_names:
1260 GenerateOutputForConfig(target_list, target_dicts, data, params, 1260 GenerateOutputForConfig(target_list, target_dicts, data, params,
1261 config_name) 1261 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