| 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 os.environ['GYP_MSVS_OVERRIDE_PATH'] = toolchain | 269 os.environ['GYP_MSVS_OVERRIDE_PATH'] = toolchain |
| 270 os.environ['GYP_MSVS_VERSION'] = '2013' | 270 os.environ['GYP_MSVS_VERSION'] = '2013' |
| 271 # We need to make sure windows_sdk_path is set to the automated toolchain | 271 # We need to make sure windows_sdk_path is set to the automated toolchain |
| 272 # values in GYP_DEFINES, but don't want to override any other values there. | 272 # values in GYP_DEFINES, but don't want to override any other values there. |
| 273 gyp_defines_dict = gyp.NameValueListToDict(gyp.ShlexEnv('GYP_DEFINES')) | 273 gyp_defines_dict = gyp.NameValueListToDict(gyp.ShlexEnv('GYP_DEFINES')) |
| 274 win8sdk = os.path.join(toolchain, 'win8sdk') | 274 win8sdk = os.path.join(toolchain, 'win8sdk') |
| 275 gyp_defines_dict['windows_sdk_path'] = win8sdk | 275 gyp_defines_dict['windows_sdk_path'] = win8sdk |
| 276 os.environ['WINDOWSSDKDIR'] = win8sdk | 276 os.environ['WINDOWSSDKDIR'] = win8sdk |
| 277 os.environ['GYP_DEFINES'] = ' '.join('%s=%s' % (k, pipes.quote(str(v))) | 277 os.environ['GYP_DEFINES'] = ' '.join('%s=%s' % (k, pipes.quote(str(v))) |
| 278 for k, v in gyp_defines_dict.iteritems()) | 278 for k, v in gyp_defines_dict.iteritems()) |
| 279 # Include the VS runtime in the PATH in case it's not machine-installed. |
| 280 runtime_path = ';'.join( |
| 281 os.path.normpath(os.path.join( |
| 282 script_dir, '..', 'third_party', 'win_toolchain', 'files', s)) |
| 283 for s in ('sys64', 'sys32')) |
| 284 os.environ['PATH'] = runtime_path + os.environ['PATH'] |
| 279 print('Using automatic toolchain in %s.' % toolchain) | 285 print('Using automatic toolchain in %s.' % toolchain) |
| 280 | 286 |
| 281 # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check | 287 # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check |
| 282 # to enfore syntax checking. | 288 # to enfore syntax checking. |
| 283 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') | 289 syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK') |
| 284 if syntax_check and int(syntax_check): | 290 if syntax_check and int(syntax_check): |
| 285 args.append('--check') | 291 args.append('--check') |
| 286 | 292 |
| 287 print 'Updating projects from gyp files...' | 293 print 'Updating projects from gyp files...' |
| 288 sys.stdout.flush() | 294 sys.stdout.flush() |
| 289 | 295 |
| 290 # Off we go... | 296 # Off we go... |
| 291 sys.exit(gyp.main(args)) | 297 sys.exit(gyp.main(args)) |
| OLD | NEW |