OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 | 2 |
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 # This script is wrapper for Chromium that adds some support for how GYP | 7 # This script is wrapper for Chromium that adds some support for how GYP |
8 # is invoked by Chromium beyond what can be done in the gclient hooks. | 8 # is invoked by Chromium beyond what can be done in the gclient hooks. |
9 | 9 |
10 import glob | 10 import glob |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 gyp_file = os.environ.get('CHROMIUM_GYP_FILE') | 214 gyp_file = os.environ.get('CHROMIUM_GYP_FILE') |
215 if gyp_file: | 215 if gyp_file: |
216 # Note that CHROMIUM_GYP_FILE values can't have backslashes as | 216 # Note that CHROMIUM_GYP_FILE values can't have backslashes as |
217 # path separators even on Windows due to the use of shlex.split(). | 217 # path separators even on Windows due to the use of shlex.split(). |
218 args.extend(shlex.split(gyp_file)) | 218 args.extend(shlex.split(gyp_file)) |
219 else: | 219 else: |
220 args.append(os.path.join(script_dir, 'all.gyp')) | 220 args.append(os.path.join(script_dir, 'all.gyp')) |
221 | 221 |
222 supplemental_includes = GetSupplementalFiles() | 222 supplemental_includes = GetSupplementalFiles() |
223 | 223 |
224 if not RunGN(supplemental_includes): | 224 # Temporarily disabled, http://crbug.com/326146 |
225 sys.exit(1) | 225 # TODO(brettw) re-enable this code |
| 226 #if not RunGN(supplemental_includes): |
| 227 #sys.exit(1) |
226 | 228 |
227 args.extend( | 229 args.extend( |
228 ['-I' + i for i in additional_include_files(supplemental_includes, args)]) | 230 ['-I' + i for i in additional_include_files(supplemental_includes, args)]) |
229 | 231 |
230 # There shouldn't be a circular dependency relationship between .gyp files, | 232 # There shouldn't be a circular dependency relationship between .gyp files, |
231 # but in Chromium's .gyp files, on non-Mac platforms, circular relationships | 233 # but in Chromium's .gyp files, on non-Mac platforms, circular relationships |
232 # currently exist. The check for circular dependencies is currently | 234 # currently exist. The check for circular dependencies is currently |
233 # bypassed on other platforms, but is left enabled on the Mac, where a | 235 # bypassed on other platforms, but is left enabled on the Mac, where a |
234 # violation of the rule causes Xcode to misbehave badly. | 236 # violation of the rule causes Xcode to misbehave badly. |
235 # TODO(mark): Find and kill remaining circular dependencies, and remove this | 237 # TODO(mark): Find and kill remaining circular dependencies, and remove this |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 # to enfore syntax checking. | 284 # to enfore syntax checking. |
283 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') | 285 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') |
284 if syntax_check and int(syntax_check): | 286 if syntax_check and int(syntax_check): |
285 args.append('--check') | 287 args.append('--check') |
286 | 288 |
287 print 'Updating projects from gyp files...' | 289 print 'Updating projects from gyp files...' |
288 sys.stdout.flush() | 290 sys.stdout.flush() |
289 | 291 |
290 # Off we go... | 292 # Off we go... |
291 sys.exit(gyp.main(args)) | 293 sys.exit(gyp.main(args)) |
OLD | NEW |