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

Side by Side Diff: pylib/gyp/generator/make.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 | « no previous file | pylib/gyp/generator/ninja.py » ('j') | 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 # Notes: 5 # Notes:
6 # 6 #
7 # This is all roughly based on the Makefile system used by the Linux 7 # This is all roughly based on the Makefile system used by the Linux
8 # kernel, but is a non-recursive make -- we put the entire dependency 8 # kernel, but is a non-recursive make -- we put the entire dependency
9 # graph in front of make and let it figure it out. 9 # graph in front of make and let it figure it out.
10 # 10 #
(...skipping 2076 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 needed_targets.add(target) 2087 needed_targets.add(target)
2088 2088
2089 build_files = set() 2089 build_files = set()
2090 include_list = set() 2090 include_list = set()
2091 for qualified_target in target_list: 2091 for qualified_target in target_list:
2092 build_file, target, toolset = gyp.common.ParseQualifiedTarget( 2092 build_file, target, toolset = gyp.common.ParseQualifiedTarget(
2093 qualified_target) 2093 qualified_target)
2094 2094
2095 this_make_global_settings = data[build_file].get('make_global_settings', []) 2095 this_make_global_settings = data[build_file].get('make_global_settings', [])
2096 assert make_global_settings_array == this_make_global_settings, ( 2096 assert make_global_settings_array == this_make_global_settings, (
2097 "make_global_settings needs to be the same for all targets.") 2097 "make_global_settings needs to be the same for all targets. %s vs. %s" %
2098 (this_make_global_settings, make_global_settings))
2098 2099
2099 build_files.add(gyp.common.RelativePath(build_file, options.toplevel_dir)) 2100 build_files.add(gyp.common.RelativePath(build_file, options.toplevel_dir))
2100 included_files = data[build_file]['included_files'] 2101 included_files = data[build_file]['included_files']
2101 for included_file in included_files: 2102 for included_file in included_files:
2102 # The included_files entries are relative to the dir of the build file 2103 # The included_files entries are relative to the dir of the build file
2103 # that included them, so we have to undo that and then make them relative 2104 # that included them, so we have to undo that and then make them relative
2104 # to the root dir. 2105 # to the root dir.
2105 relative_include_file = gyp.common.RelativePath( 2106 relative_include_file = gyp.common.RelativePath(
2106 gyp.common.UnrelativePath(included_file, build_file), 2107 gyp.common.UnrelativePath(included_file, build_file),
2107 options.toplevel_dir) 2108 options.toplevel_dir)
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
2169 root_makefile.write("endif\n") 2170 root_makefile.write("endif\n")
2170 root_makefile.write('\n') 2171 root_makefile.write('\n')
2171 2172
2172 if (not generator_flags.get('standalone') 2173 if (not generator_flags.get('standalone')
2173 and generator_flags.get('auto_regeneration', True)): 2174 and generator_flags.get('auto_regeneration', True)):
2174 WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files) 2175 WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
2175 2176
2176 root_makefile.write(SHARED_FOOTER) 2177 root_makefile.write(SHARED_FOOTER)
2177 2178
2178 root_makefile.close() 2179 root_makefile.close()
OLDNEW
« no previous file with comments | « no previous file | pylib/gyp/generator/ninja.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698