aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/project/boost/build.py
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-01-17 13:54:57 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-01-17 13:54:57 +0300
commitdd2c5b58c4fe77d7ce35f3abb6e1bb399560a2db (patch)
tree813808b873a5895d7f212f890c68ff14820dc591 /project/boost/build.py
parentTravis/AppVeyor: pause (diff)
downloadcmake-common-dd2c5b58c4fe77d7ce35f3abb6e1bb399560a2db.tar.gz
cmake-common-dd2c5b58c4fe77d7ce35f3abb6e1bb399560a2db.zip
GIANT CLUSTERFUCK OF A COMMIT
OK, this is epic. I was basically just trying to a) support Clang and b) add more test coverage. _THREE MONTHS_ and a few hundred CI runs later, this is what I came up with. I don't know how it ended up being what it is, but here we go. Some highlights of the changes: 1) CI builds has been moved to GitHub Actions, 2) the entire notion of a toolchain has been reworked; it now supports Clang on all platforms. * .github: this directory contains the GitHub Actions workflow scripts/actions. In the process, I created like 6 external GitHub actions, but it's still pretty massive. An upside is that it covers much more platform/toolchain combinations _and_ check a lot of the expected post-conditions. TODO: .ci/Makefile is obsolete now, as well as .travis.yml and .appveyor.yml. * common.cmake: added Clang support. In the process, a great deal has been learned about how CMake works; in particular, static runtime support has been reworked to be more robust. * project: the entire notion of a "toolchain" has been reworked. Instead of a measly --mingw parameter, there's now a separate --toolset parameter, which allows you to choose between GCC, Clang, MSVC, etc. Both Boost and CMake build scripts were enhanced greatly to support Clang and other toolchains in a more robust way.
Diffstat (limited to '')
-rw-r--r--project/boost/build.py34
1 files changed, 22 insertions, 12 deletions
diff --git a/project/boost/build.py b/project/boost/build.py
index a9fe8da..3a073f3 100644
--- a/project/boost/build.py
+++ b/project/boost/build.py
@@ -5,8 +5,8 @@
R'''Build Boost.
-This script builds the Boost libraries. It's main utility is setting the
-correct --stagedir parameter value to avoid name clashes.
+This script builds the Boost libraries. It main utility is setting the correct
+--stagedir parameter value to avoid name clashes.
Usage example:
@@ -46,6 +46,7 @@ import sys
import tempfile
from project.boost.directory import BoostDir
+from project.toolchain import ToolchainType
from project.boost.toolchain import Toolchain
from project.configuration import Configuration
from project.linkage import Linkage
@@ -60,14 +61,14 @@ DEFAULT_CONFIGURATIONS = (Configuration.DEBUG, Configuration.RELEASE,)
# binaries from a CI, etc. and run them everywhere):
DEFAULT_LINK = (Linkage.STATIC,)
DEFAULT_RUNTIME_LINK = Linkage.STATIC
-# Shut compilers up:
-COMMON_B2_ARGS = ['-d0']
+B2_QUIET = ['-d0']
+B2_VERBOSE = ['-d2', '--debug-configuration']
class BuildParameters:
def __init__(self, boost_dir, build_dir=None, platforms=None,
configurations=None, link=None, runtime_link=None,
- mingw=False, b2_args=None):
+ toolset=None, verbose=False, b2_args=None):
boost_dir = normalize_path(boost_dir)
if build_dir is not None:
@@ -76,10 +77,12 @@ class BuildParameters:
configurations = configurations or DEFAULT_CONFIGURATIONS
link = link or DEFAULT_LINK
runtime_link = runtime_link or DEFAULT_RUNTIME_LINK
+ toolset = toolset or ToolchainType.AUTO
+ verbosity = B2_VERBOSE if verbose else B2_QUIET
if b2_args:
- b2_args = COMMON_B2_ARGS + b2_args
+ b2_args = verbosity + b2_args
else:
- b2_args = COMMON_B2_ARGS
+ b2_args = verbosity
self.boost_dir = boost_dir
self.build_dir = build_dir
@@ -88,17 +91,20 @@ class BuildParameters:
self.configurations = configurations
self.link = link
self.runtime_link = runtime_link
- self.mingw = mingw
+ self.toolset = toolset
self.b2_args = b2_args
@staticmethod
def from_args(args):
return BuildParameters(**vars(args))
+ def get_bootstrap_args(self):
+ return self.toolset.get_bootstrap_args()
+
def enum_b2_args(self):
with self._create_build_dir() as build_dir:
for platform in self.platforms:
- with Toolchain.detect(platform, mingw=self.mingw) as toolchain:
+ with Toolchain.detect(self.toolset, platform) as toolchain:
for configuration in self.configurations:
for link, runtime_link in self._linkage_options():
yield self._build_params(build_dir, toolchain,
@@ -138,9 +144,9 @@ class BuildParameters:
params.append(self._stagedir(toolchain, configuration))
params.append('--layout=system')
params += toolchain.get_b2_args()
+ params.append(self._variant(configuration))
params.append(self._link(link))
params.append(self._runtime_link(runtime_link))
- params.append(self._variant(configuration))
params += self.b2_args
return params
@@ -204,8 +210,10 @@ def _parse_args(argv=None):
type=Linkage.parse, default=DEFAULT_RUNTIME_LINK,
help=f'how the libraries link to the runtime ({linkage_options})')
- parser.add_argument('--mingw', action='store_true',
- help='build using MinGW-w64')
+ toolset_options = '/'.join(map(str, ToolchainType.all()))
+ parser.add_argument('--toolset', metavar='TOOLSET',
+ type=ToolchainType.parse, default=ToolchainType.AUTO,
+ help=f'toolset to use ({toolset_options})')
parser.add_argument('--build', metavar='DIR', dest='build_dir',
type=normalize_path,
@@ -214,6 +222,8 @@ def _parse_args(argv=None):
type=normalize_path,
help='root Boost directory')
+ parser.add_argument('-v', '--verbose', action='store_true',
+ help='verbose b2 invocation (quiet by default)')
parser.add_argument('b2_args', metavar='B2_ARG',
nargs='*', default=[],
help='additional b2 arguments, to be passed verbatim')