aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/boost/build/ci
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2020-01-07 02:02:19 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2020-01-07 02:13:48 +0300
commitb0110256e5d0f77830f5d8419dc4939402462e00 (patch)
treed19bba977ebf10ea9259409c2d36b01ac35d00a2 /boost/build/ci
parentboost/build: remove --label (diff)
downloadcmake-common-b0110256e5d0f77830f5d8419dc4939402462e00.tar.gz
cmake-common-b0110256e5d0f77830f5d8419dc4939402462e00.zip
boost/build: add the --link parameter
Diffstat (limited to 'boost/build/ci')
-rw-r--r--boost/build/ci/appveyor.py15
-rwxr-xr-xboost/build/ci/travis.py7
2 files changed, 18 insertions, 4 deletions
diff --git a/boost/build/ci/appveyor.py b/boost/build/ci/appveyor.py
index 3f8d0cd..e6a330d 100644
--- a/boost/build/ci/appveyor.py
+++ b/boost/build/ci/appveyor.py
@@ -56,6 +56,8 @@ def _parse_args(argv=None):
logging.info('Command line arguments: %s', argv)
parser = argparse.ArgumentParser()
+ parser.add_argument('--link', metavar='LINKAGE', nargs='*',
+ help='how the libraries are linked (i.e. static/shared)')
parser.add_argument('b2_args', nargs='*', metavar='B2_ARG', default=[],
help='additional b2 arguments, to be passed verbatim')
return parser.parse_args(argv)
@@ -71,20 +73,25 @@ def build_appveyor(argv=None):
from build import BoostVersion, main as build_main
version = BoostVersion.from_string(_get_boost_version())
- travis_argv = [
+ appveyor_argv = [
'download',
'--unpack', _get_build_dir(),
'--', str(version)
]
- build_main(travis_argv)
+ build_main(appveyor_argv)
- travis_argv = [
+ appveyor_argv = [
'build',
'--configuration', _get_configuration(),
'--platform', _get_platform(),
+ ]
+ if args.link is not None:
+ appveyor_argv.append('--link')
+ appveyor_argv += args.link
+ appveyor_argv += [
'--', version.dir_path(_get_build_dir()),
]
- build_main(travis_argv + args.b2_args)
+ build_main(appveyor_argv + args.b2_args)
def main(argv=None):
diff --git a/boost/build/ci/travis.py b/boost/build/ci/travis.py
index d5d00eb..74ba29f 100755
--- a/boost/build/ci/travis.py
+++ b/boost/build/ci/travis.py
@@ -54,6 +54,8 @@ def _parse_args(argv=None):
logging.info('Command line arguments: %s', argv)
parser = argparse.ArgumentParser()
+ parser.add_argument('--link', metavar='LINKAGE', nargs='*',
+ help='how the libraries are linked (i.e. static/shared)')
parser.add_argument('b2_args', nargs='*', metavar='B2_ARG', default=[],
help='additional b2 arguments, to be passed verbatim')
return parser.parse_args(argv)
@@ -80,6 +82,11 @@ def build_travis(argv=None):
'build',
'--configuration', _get_configuration(),
'--platform', _get_platform(),
+ ]
+ if args.link is not None:
+ travis_argv.append('--link')
+ travis_argv += args.link
+ travis_argv += [
'--', version.dir_path(_get_build_dir()),
]
build_main(travis_argv + args.b2_args)