diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-13 23:30:49 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2019-12-14 00:55:36 +0300 |
| commit | f6370504cef464e7c081d1c914df2754e69f7aa0 (patch) | |
| tree | 3220046d0f6779d776b47df1bf0c77ecbefb636c /ci/boost/build_travis.py | |
| parent | boost/build.py: no linkage options (diff) | |
| download | cmake-common-f6370504cef464e7c081d1c914df2754e69f7aa0.tar.gz cmake-common-f6370504cef464e7c081d1c914df2754e69f7aa0.zip | |
boost/build.py: split into subcommands
Diffstat (limited to 'ci/boost/build_travis.py')
| -rwxr-xr-x | ci/boost/build_travis.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ci/boost/build_travis.py b/ci/boost/build_travis.py index 8e78f72..bfdccc0 100755 --- a/ci/boost/build_travis.py +++ b/ci/boost/build_travis.py @@ -13,7 +13,7 @@ import logging import os import sys -from build import download_and_build +from build import BoostVersion, main as build_main def _env(name): @@ -54,13 +54,20 @@ def build_travis(argv=None): argv = sys.argv[1:] logging.info('Command line arguments: %s', argv) _check_travis() + version = BoostVersion.from_string(_get_boost_version()) travis_argv = [ + 'download', '--build', _get_build_dir(), - '--version', _get_boost_version(), + '--', str(version) + ] + build_main(travis_argv) + travis_argv = [ + 'build', '--configuration', _get_configuration(), '--platform', _get_platform(), + '--', version.dir_path(_get_build_dir()), ] - download_and_build(travis_argv + argv) + build_main(travis_argv + argv) def main(argv=None): |