aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/project/boost/directory.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/directory.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 'project/boost/directory.py')
-rw-r--r--project/boost/directory.py18
1 files changed, 13 insertions, 5 deletions
diff --git a/project/boost/directory.py b/project/boost/directory.py
index 17448b6..9b35194 100644
--- a/project/boost/directory.py
+++ b/project/boost/directory.py
@@ -6,6 +6,7 @@
import logging
import os.path
+from project.boost.toolchain import BootstrapToolchain
from project.utils import cd, run
from project.os import on_windows
@@ -21,18 +22,19 @@ class BoostDir:
def build(self, params):
with self._go():
- self._bootstrap_if_required()
+ self._bootstrap_if_required(params)
self._b2(params)
- def _bootstrap_if_required(self):
+ def _bootstrap_if_required(self, params):
if os.path.isfile(self._b2_path()):
logging.info('Not going to bootstrap, b2 is already there')
return
- self.bootstrap()
+ self.bootstrap(params)
- def bootstrap(self):
+ def bootstrap(self, params):
with self._go():
- run(self._bootstrap_path())
+ toolchain = BootstrapToolchain.detect(params.toolset)
+ run([self._bootstrap_path()] + self._bootstrap_args(toolchain))
def _b2(self, params):
for b2_params in params.enum_b2_args():
@@ -50,6 +52,12 @@ class BoostDir:
return f'bootstrap{ext}'
@staticmethod
+ def _bootstrap_args(toolchain):
+ if on_windows():
+ return toolchain.get_bootstrap_bat_args()
+ return toolchain.get_bootstrap_sh_args()
+
+ @staticmethod
def _b2_path():
return os.path.join('.', BoostDir._b2_name())