diff options
| -rw-r--r-- | project/boost/toolchain.py | 3 | ||||
| -rw-r--r-- | project/ci/boost.py | 1 | ||||
| -rw-r--r-- | project/ci/cmake.py | 1 | ||||
| -rw-r--r-- | project/ci/dirs.py | 12 |
4 files changed, 10 insertions, 7 deletions
diff --git a/project/boost/toolchain.py b/project/boost/toolchain.py index 1f6ae5e..8dd11da 100644 --- a/project/boost/toolchain.py +++ b/project/boost/toolchain.py @@ -189,7 +189,8 @@ class CustomToolchain(Toolchain): def get_compiler(self): pass - def get_compiler_version(self): + @staticmethod + def get_compiler_version(): return CustomToolchain.COMPILER_VERSION @abc.abstractmethod diff --git a/project/ci/boost.py b/project/ci/boost.py index e246963..a68e761 100644 --- a/project/ci/boost.py +++ b/project/ci/boost.py @@ -4,7 +4,6 @@ # Distributed under the MIT License. import argparse -import logging import sys from project.boost.build import BuildParameters, build diff --git a/project/ci/cmake.py b/project/ci/cmake.py index 1f3dab8..dbe31f6 100644 --- a/project/ci/cmake.py +++ b/project/ci/cmake.py @@ -4,7 +4,6 @@ # Distributed under the MIT License. import argparse -import logging import os.path import sys diff --git a/project/ci/dirs.py b/project/ci/dirs.py index 60fbdf8..6c9aa7a 100644 --- a/project/ci/dirs.py +++ b/project/ci/dirs.py @@ -44,15 +44,18 @@ class Dirs(abc.ABC): def this_one(self): pass - def get_toolset(self): + @staticmethod + def get_toolset(): if 'TOOLSET' in os.environ: return ToolchainType.parse(os.environ['TOOLSET']) return None - def get_platform(self): + @staticmethod + def get_platform(): return Platform.parse(env('PLATFORM')) - def get_configuration(self): + @staticmethod + def get_configuration(): return Configuration.parse(env('CONFIGURATION')) @abc.abstractmethod @@ -66,7 +69,8 @@ class Dirs(abc.ABC): def get_prebuilt_boost_dir(self): pass - def get_boost_version(self): + @staticmethod + def get_boost_version(): return Version.from_string(env('BOOST_VERSION')) def get_boost_dir(self): |