From 98e3a56296cb9955e49adb09a111f26e07328338 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 30 Mar 2020 11:56:05 +0300 Subject: project.ci: dedupe code --- project/ci/travis/boost.py | 101 ++------------------------------------------- project/ci/travis/cmake.py | 80 ++--------------------------------- 2 files changed, 6 insertions(+), 175 deletions(-) (limited to 'project/ci/travis') diff --git a/project/ci/travis/boost.py b/project/ci/travis/boost.py index e77370c..7aff33e 100644 --- a/project/ci/travis/boost.py +++ b/project/ci/travis/boost.py @@ -3,109 +3,14 @@ # For details, see https://github.com/egor-tensin/cmake-common. # Distributed under the MIT License. -R'''Download & build Boost on Travis. - -This is similar to running both project.boost.download & project.boost.build, -but auto-fills some parameters from the Travis-defined environment variables. - -Boost is built in $HOME/boost. -''' - -import argparse -import logging -import os -import os.path -import sys - -from project.boost.version import Version -from project.boost.download import DownloadParameters, download -from project.boost.build import BuildParameters, build -from project.configuration import Configuration -from project.linkage import Linkage -from project.platform import Platform +from project.ci.boost import build_ci +from project.ci.dirs import Travis from project.utils import setup_logging -def _env(name): - if name not in os.environ: - raise RuntimeError(f'undefined environment variable: {name}') - return os.environ[name] - - -def _check_travis(): - if 'TRAVIS' not in os.environ: - raise RuntimeError('not running on Travis') - - -def _get_build_dir(): - return _env('HOME') - - -def _get_boost_dir(): - return os.path.join(_get_build_dir(), 'boost') - - -def _get_boost_version(): - return Version.from_string(_env('travis_boost_version')) - - -def _get_configuration(): - return Configuration.parse(_env('configuration')) - - -def _get_platform(): - return Platform.parse(_env('platform')) - - -def _parse_args(argv=None): - if argv is None: - argv = sys.argv[1:] - logging.info('Command line arguments: %s', argv) - - parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - - parser.add_argument('--link', metavar='LINKAGE', - nargs='*', type=Linkage.parse, - help='how the libraries are linked') - parser.add_argument('--runtime-link', metavar='LINKAGE', - type=Linkage.parse, - help='how the libraries link to the runtime') - parser.add_argument('--mingw', action='store_true', - help='build using MinGW-w64') - parser.add_argument('b2_args', metavar='B2_ARG', - nargs='*', default=[], - help='additional b2 arguments, to be passed verbatim') - - return parser.parse_args(argv) - - -def build_travis(argv=None): - args = _parse_args(argv) - _check_travis() - - version = _get_boost_version() - build_dir = _get_build_dir() - download(DownloadParameters(version, unpack_dir=build_dir)) - - unpacked_boost_dir = version.dir_path(_get_build_dir()) - boost_dir = _get_boost_dir() - os.rename(unpacked_boost_dir, boost_dir) - - params = BuildParameters(boost_dir, - platforms=(_get_platform(),), - configurations=(_get_configuration(),), - link=args.link, - runtime_link=args.runtime_link, - mingw=args.mingw, - b2_args=args.b2_args) - build(params) - - def main(argv=None): with setup_logging(): - build_travis(argv) + build_ci(Travis(), argv) if __name__ == '__main__': diff --git a/project/ci/travis/cmake.py b/project/ci/travis/cmake.py index 2814e41..2f030af 100644 --- a/project/ci/travis/cmake.py +++ b/project/ci/travis/cmake.py @@ -3,88 +3,14 @@ # For details, see https://github.com/egor-tensin/cmake-common. # Distributed under the MIT License. -R'''Build a CMake project on Travis. - -This is similar to build.py, but auto-fills some parameters for build.py from -the Travis-defined environment variables. - -The project is built in $HOME/build. -''' - -import argparse -import logging -import os -import os.path -import sys - -from project.cmake.build import BuildParameters, build -from project.configuration import Configuration -from project.platform import Platform +from project.ci.cmake import build_ci +from project.ci.dirs import Travis from project.utils import setup_logging -def _env(name): - if name not in os.environ: - raise RuntimeError(f'undefined environment variable: {name}') - return os.environ[name] - - -def _check_travis(): - if 'TRAVIS' not in os.environ: - raise RuntimeError('not running on Travis') - - -def _get_src_dir(): - return _env('TRAVIS_BUILD_DIR') - - -def _get_build_dir(): - return os.path.join(_env('HOME'), 'build') - - -def _get_platform(): - return Platform.parse(_env('platform')) - - -def _get_configuration(): - return Configuration.parse(_env('configuration')) - - -def _parse_args(argv=None): - if argv is None: - argv = sys.argv[1:] - logging.info('Command line arguments: %s', argv) - - parser = argparse.ArgumentParser( - description=__doc__, - formatter_class=argparse.RawDescriptionHelpFormatter) - - parser.add_argument('--install', metavar='DIR', dest='install_dir', - help='install directory') - parser.add_argument('--boost', metavar='DIR', dest='boost_dir', - help='set Boost directory path') - parser.add_argument('cmake_args', nargs='*', metavar='CMAKE_ARG', default=[], - help='additional CMake arguments, to be passed verbatim') - return parser.parse_args(argv) - - -def build_travis(argv=None): - args = _parse_args(argv) - _check_travis() - - params = BuildParameters(_get_src_dir(), - build_dir=_get_build_dir(), - install_dir=args.install_dir, - platform=_get_platform(), - configuration=_get_configuration(), - boost_dir=args.boost_dir, - cmake_args=args.cmake_args) - build(params) - - def main(argv=None): with setup_logging(): - build_travis(argv) + build_ci(Travis(), argv) if __name__ == '__main__': -- cgit v1.2.3