| 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 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \ | 447 elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \ |
| 448 not 'OS=ios' in os.environ.get('GYP_DEFINES', []): | 448 not 'OS=ios' in os.environ.get('GYP_DEFINES', []): |
| 449 os.environ['GYP_GENERATORS'] = 'ninja' | 449 os.environ['GYP_GENERATORS'] = 'ninja' |
| 450 | 450 |
| 451 # If on Windows, request that depot_tools install/update the automatic | 451 # If on Windows, request that depot_tools install/update the automatic |
| 452 # toolchain, and then use it (unless opted-out). | 452 # toolchain, and then use it (unless opted-out). |
| 453 vs2013_runtime_dll_dirs = None | 453 vs2013_runtime_dll_dirs = None |
| 454 depot_tools_win_toolchain = \ | 454 depot_tools_win_toolchain = \ |
| 455 bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) | 455 bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))) |
| 456 # TODO(scottmg): temp build fix while switching to 2013. | 456 # TODO(scottmg): temp build fix while switching to 2013. |
| 457 if False and \ | 457 if sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain: |
| 458 sys.platform in ('win32', 'cygwin') and depot_tools_win_toolchain: | |
| 459 import find_depot_tools | 458 import find_depot_tools |
| 460 depot_tools_path = find_depot_tools.add_depot_tools_to_path() | 459 depot_tools_path = find_depot_tools.add_depot_tools_to_path() |
| 461 temp_handle, data_file = tempfile.mkstemp(suffix='.json') | 460 temp_handle, data_file = tempfile.mkstemp(suffix='.json') |
| 462 os.close(temp_handle) | 461 os.close(temp_handle) |
| 463 get_toolchain_args = [ | 462 get_toolchain_args = [ |
| 464 sys.executable, | 463 sys.executable, |
| 465 os.path.join(depot_tools_path, | 464 os.path.join(depot_tools_path, |
| 466 'win_toolchain', | 465 'win_toolchain', |
| 467 'get_toolchain_if_necessary.py'), | 466 'get_toolchain_if_necessary.py'), |
| 468 '--output-json', data_file, | 467 '--output-json', data_file, |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 # from above are picked up. | 532 # from above are picked up. |
| 534 print 'Running build/landmines.py...' | 533 print 'Running build/landmines.py...' |
| 535 subprocess.check_call( | 534 subprocess.check_call( |
| 536 [sys.executable, os.path.join(script_dir, 'landmines.py')]) | 535 [sys.executable, os.path.join(script_dir, 'landmines.py')]) |
| 537 | 536 |
| 538 if vs2013_runtime_dll_dirs: | 537 if vs2013_runtime_dll_dirs: |
| 539 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), | 538 CopyVsRuntimeDlls(os.path.join(chrome_src, GetOutputDirectory()), |
| 540 vs2013_runtime_dll_dirs) | 539 vs2013_runtime_dll_dirs) |
| 541 | 540 |
| 542 sys.exit(gyp_rc) | 541 sys.exit(gyp_rc) |
| OLD | NEW |