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

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

Issue 104923014: Write the make_global_settings to the error message. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 12 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 | « pylib/gyp/generator/make.py ('k') | 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) 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 copy 5 import copy
6 import hashlib 6 import hashlib
7 import json 7 import json
8 import multiprocessing 8 import multiprocessing
9 import os.path 9 import os.path
10 import re 10 import re
(...skipping 2009 matching lines...) Expand 10 before | Expand all | Expand 10 after
2020 # objects. 2020 # objects.
2021 target_short_names = {} 2021 target_short_names = {}
2022 2022
2023 for qualified_target in target_list: 2023 for qualified_target in target_list:
2024 # qualified_target is like: third_party/icu/icu.gyp:icui18n#target 2024 # qualified_target is like: third_party/icu/icu.gyp:icui18n#target
2025 build_file, name, toolset = \ 2025 build_file, name, toolset = \
2026 gyp.common.ParseQualifiedTarget(qualified_target) 2026 gyp.common.ParseQualifiedTarget(qualified_target)
2027 2027
2028 this_make_global_settings = data[build_file].get('make_global_settings', []) 2028 this_make_global_settings = data[build_file].get('make_global_settings', [])
2029 assert make_global_settings == this_make_global_settings, ( 2029 assert make_global_settings == this_make_global_settings, (
2030 "make_global_settings needs to be the same for all targets.") 2030 "make_global_settings needs to be the same for all targets. %s vs. %s" %
2031 (this_make_global_settings, make_global_settings))
2031 2032
2032 spec = target_dicts[qualified_target] 2033 spec = target_dicts[qualified_target]
2033 if flavor == 'mac': 2034 if flavor == 'mac':
2034 gyp.xcode_emulation.MergeGlobalXcodeSettingsToSpec(data[build_file], spec) 2035 gyp.xcode_emulation.MergeGlobalXcodeSettingsToSpec(data[build_file], spec)
2035 2036
2036 build_file = gyp.common.RelativePath(build_file, options.toplevel_dir) 2037 build_file = gyp.common.RelativePath(build_file, options.toplevel_dir)
2037 2038
2038 base_path = os.path.dirname(build_file) 2039 base_path = os.path.dirname(build_file)
2039 obj = 'obj' 2040 obj = 'obj'
2040 if toolset != 'target': 2041 if toolset != 'target':
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
2123 arglists.append( 2124 arglists.append(
2124 (target_list, target_dicts, data, params, config_name)) 2125 (target_list, target_dicts, data, params, config_name))
2125 pool.map(CallGenerateOutputForConfig, arglists) 2126 pool.map(CallGenerateOutputForConfig, arglists)
2126 except KeyboardInterrupt, e: 2127 except KeyboardInterrupt, e:
2127 pool.terminate() 2128 pool.terminate()
2128 raise e 2129 raise e
2129 else: 2130 else:
2130 for config_name in config_names: 2131 for config_name in config_names:
2131 GenerateOutputForConfig(target_list, target_dicts, data, params, 2132 GenerateOutputForConfig(target_list, target_dicts, data, params,
2132 config_name) 2133 config_name)
OLDNEW
« no previous file with comments | « pylib/gyp/generator/make.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698