| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 | 2 |
| 3 | 3 |
| 4 import gyp | 4 import gyp |
| 5 import gyp.common | 5 import gyp.common |
| 6 # TODO(sgk): create a separate "project module" for SCons? | 6 # TODO(sgk): create a separate "project module" for SCons? |
| 7 #import gyp.SCons as SCons | 7 #import gyp.SCons as SCons |
| 8 import os.path | 8 import os.path |
| 9 import pprint | 9 import pprint |
| 10 import re | 10 import re |
| (...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 sconscript_files.append(sconscript) | 551 sconscript_files.append(sconscript) |
| 552 | 552 |
| 553 | 553 |
| 554 target_alias_list= [] | 554 target_alias_list= [] |
| 555 | 555 |
| 556 conf_list = GetOption('conf_list') | 556 conf_list = GetOption('conf_list') |
| 557 if conf_list: | 557 if conf_list: |
| 558 # In case the same --mode= value was specified multiple times. | 558 # In case the same --mode= value was specified multiple times. |
| 559 conf_list = list(set(conf_list)) | 559 conf_list = list(set(conf_list)) |
| 560 else: | 560 else: |
| 561 conf_list = ['Debug'] | 561 conf_list = ['Default'] |
| 562 | 562 |
| 563 sconsbuild_dir = Dir(%(sconsbuild_dir)s) | 563 sconsbuild_dir = Dir(%(sconsbuild_dir)s) |
| 564 | 564 |
| 565 src_dir = GetOption('repository') | 565 src_dir = GetOption('repository') |
| 566 if src_dir: | 566 if src_dir: |
| 567 # Deep SCons magick to support --srcdir={chromium_component}: | 567 # Deep SCons magick to support --srcdir={chromium_component}: |
| 568 # By specifying --srcdir=, a connection has already been set up | 568 # By specifying --srcdir=, a connection has already been set up |
| 569 # between our current directory (the build directory) and the | 569 # between our current directory (the build directory) and the |
| 570 # component source directory (base/, net/, webkit/, etc.). | 570 # component source directory (base/, net/, webkit/, etc.). |
| 571 # The Chromium build is really rooted at src/, so we need to | 571 # The Chromium build is really rooted at src/, so we need to |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 if target_dicts[t]['type'] == 'settings': | 778 if target_dicts[t]['type'] == 'settings': |
| 779 continue | 779 continue |
| 780 bf, target = gyp.common.BuildFileAndTarget('', t)[:2] | 780 bf, target = gyp.common.BuildFileAndTarget('', t)[:2] |
| 781 target_filename = TargetFilename(target, bf, options.suffix) | 781 target_filename = TargetFilename(target, bf, options.suffix) |
| 782 tpath = gyp.common.RelativePath(target_filename, output_dir) | 782 tpath = gyp.common.RelativePath(target_filename, output_dir) |
| 783 sconscript_files[target] = tpath | 783 sconscript_files[target] = tpath |
| 784 | 784 |
| 785 if sconscript_files: | 785 if sconscript_files: |
| 786 GenerateSConscriptWrapper(data[build_file], basename, | 786 GenerateSConscriptWrapper(data[build_file], basename, |
| 787 output_filename, sconscript_files) | 787 output_filename, sconscript_files) |
| OLD | NEW |