aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ci/boost
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2019-12-13 23:30:49 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2019-12-14 00:55:36 +0300
commitf6370504cef464e7c081d1c914df2754e69f7aa0 (patch)
tree3220046d0f6779d776b47df1bf0c77ecbefb636c /ci/boost
parentboost/build.py: no linkage options (diff)
downloadcmake-common-f6370504cef464e7c081d1c914df2754e69f7aa0.tar.gz
cmake-common-f6370504cef464e7c081d1c914df2754e69f7aa0.zip
boost/build.py: split into subcommands
Diffstat (limited to '')
-rwxr-xr-xci/boost/build.py98
-rwxr-xr-xci/boost/build_travis.py13
2 files changed, 66 insertions, 45 deletions
diff --git a/ci/boost/build.py b/ci/boost/build.py
index 25444c1..2cd0043 100755
--- a/ci/boost/build.py
+++ b/ci/boost/build.py
@@ -102,6 +102,13 @@ class BoostVersion:
self.minor = minor
self.patch = patch
+ @staticmethod
+ def from_string(s):
+ result = re.match(r'^(\d+)\.(\d+)\.(\d+)$', s)
+ if result is None:
+ raise ValueError(f'invalid Boost version: {s}')
+ return BoostVersion(result.group(1), result.group(2), result.group(3))
+
def __str__(self):
return f'{self.major}.{self.minor}.{self.patch}'
@@ -124,13 +131,6 @@ class BoostVersion:
return f'https://dl.bintray.com/boostorg/release/{self}/source/{self.archive_name}'
-def _parse_boost_version(s):
- result = re.match(r'^(\d+)\.(\d+)\.(\d+)$', s)
- if result is None:
- raise argparse.ArgumentTypeError(f'invalid Boost version: {s}')
- return BoostVersion(result.group(1), result.group(2), result.group(3))
-
-
class BoostArchive:
def __init__(self, version, path):
self.version = version
@@ -188,10 +188,11 @@ class BoostDir:
if os.path.isfile(self._b2_path()):
logging.info('Not going to bootstrap, b2 is already there')
return
- self._bootstrap()
+ self.bootstrap()
- def _bootstrap(self):
- _run_executable(self._bootstrap_path())
+ def bootstrap(self):
+ with self._go():
+ _run_executable(self._bootstrap_path())
def _b2(self, params):
for b2_params in params.enum_b2_params():
@@ -273,48 +274,61 @@ def _parse_args(argv=None):
if argv is None:
argv = sys.argv[1:]
logging.info('Command line arguments: %s', argv)
+
parser = argparse.ArgumentParser()
- parser.add_argument('--version', metavar='VERSION', dest='boost_version',
- type=_parse_boost_version, required=True,
- help='Boost version (in the MAJOR.MINOR.PATCH format)')
- parser.add_argument('--no-download', action='store_true',
- help="don't download Boost, attempt to build the existing directory")
- parser.add_argument('--platform', metavar='PLATFORM',
- nargs='*', dest='platforms', default=(),
- type=_parse_platform,
- help='target platform (e.g. x86/x64)')
- parser.add_argument('--configuration', metavar='CONFIGURATION',
- nargs='*', dest='configurations', default=(),
- type=_parse_configuration,
- help='target platform (e.g. Debug/Release)')
- parser.add_argument('--build', metavar='DIR', dest='build_dir',
- type=os.path.abspath, default='.',
- help='destination directory')
- parser.add_argument('--with', metavar='LIB', dest='libraries',
- nargs='*', default=(),
- help='only build these libraries')
- parser.add_argument('b2_args', nargs='*', metavar='B2_ARG', default=(),
- help='additional b2 arguments, to be passed verbatim')
+ subparsers = parser.add_subparsers(dest='command')
+
+ download = subparsers.add_parser('download', help='download Boost')
+ download.add_argument('boost_version', metavar='VERSION',
+ type=BoostVersion.from_string,
+ help='Boost version (in the MAJOR.MINOR.PATCH format)')
+ download.add_argument('--build', metavar='DIR', dest='build_dir',
+ type=os.path.abspath, default='.',
+ help='destination directory')
+
+ build = subparsers.add_parser('build', help='build Boost libraries')
+ build.add_argument('--platform', metavar='PLATFORM',
+ nargs='*', dest='platforms', default=(),
+ type=_parse_platform,
+ help='target platform (e.g. x86/x64)')
+ build.add_argument('--configuration', metavar='CONFIGURATION',
+ nargs='*', dest='configurations', default=(),
+ type=_parse_configuration,
+ help='target configuration (e.g. Debug/Release)')
+ build.add_argument('--with', metavar='LIB', dest='libraries',
+ nargs='*', default=(),
+ help='only build these libraries')
+ build.add_argument('boost_dir', metavar='DIR',
+ help='Boost root directory')
+ build.add_argument('b2_args', nargs='*', metavar='B2_ARG', default=(),
+ help='additional b2 arguments, to be passed verbatim')
+
return parser.parse_args(argv)
-def _build(boost_dir, build_params):
+def build(args):
+ build_params = BoostBuild(args)
+ boost_dir = BoostDir(args.boost_dir)
boost_dir.build(build_params)
-def download_and_build(argv=None):
+def download(args):
+ with BoostArchive.download(args.boost_version) as archive:
+ boost_dir = BoostDir.unpack(archive, args.build_dir)
+ boost_dir.bootstrap()
+
+
+def main(argv=None):
args = _parse_args(argv)
- build_params = BoostBuild(args)
- if args.no_download:
- boost_dir = BoostDir(args.boost_version.dir_path(args.build_dir))
- _build(boost_dir, build_params)
+ if args.command == 'download':
+ download(args)
+ elif args.command == 'build':
+ build(args)
else:
- with BoostArchive.download(args.boost_version) as archive:
- boost_dir = BoostDir.unpack(archive, args.build_dir)
- _build(boost_dir, build_params)
+ raise NotImplementedError(f'unsupported command: {args.command}')
-def main(argv=None):
+def _main(argv=None):
_setup_logging()
try:
download_and_build(argv)
@@ -324,4 +338,4 @@ def main(argv=None):
if __name__ == '__main__':
- main()
+ _main()
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):