aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--project/boost/build.py4
-rw-r--r--project/boost/directory.py2
-rw-r--r--project/boost/toolset.py (renamed from project/boost/toolchain.py)2
-rw-r--r--project/ci/dirs.py2
-rw-r--r--project/cmake/build.py4
-rw-r--r--project/cmake/toolset.py (renamed from project/cmake/toolchain.py)2
-rw-r--r--project/toolset.py (renamed from project/toolchain.py)0
7 files changed, 8 insertions, 8 deletions
diff --git a/project/boost/build.py b/project/boost/build.py
index 32b355a..d1766ee 100644
--- a/project/boost/build.py
+++ b/project/boost/build.py
@@ -31,8 +31,8 @@ import sys
import tempfile
from project.boost.directory import BoostDir
-from project.toolchain import ToolchainType
-from project.boost.toolchain import Toolchain
+from project.toolset import ToolchainType
+from project.boost.toolset import Toolchain
from project.configuration import Configuration
from project.linkage import Linkage
from project.platform import Platform
diff --git a/project/boost/directory.py b/project/boost/directory.py
index 162562c..7c39383 100644
--- a/project/boost/directory.py
+++ b/project/boost/directory.py
@@ -6,7 +6,7 @@
import logging
import os.path
-from project.boost.toolchain import Toolchain
+from project.boost.toolset import Toolchain
from project.utils import cd, run
from project.os import on_windows
diff --git a/project/boost/toolchain.py b/project/boost/toolset.py
index 5fa2043..c59ef23 100644
--- a/project/boost/toolchain.py
+++ b/project/boost/toolset.py
@@ -13,7 +13,7 @@ import shutil
import project.mingw
import project.os
-from project.toolchain import ToolchainType
+from project.toolset import ToolchainType
from project.utils import temp_file
diff --git a/project/ci/dirs.py b/project/ci/dirs.py
index 6c9aa7a..6804ff4 100644
--- a/project/ci/dirs.py
+++ b/project/ci/dirs.py
@@ -11,7 +11,7 @@ from project.boost.version import Version
from project.ci.appveyor.generator import Generator, Image
from project.configuration import Configuration
from project.platform import Platform
-from project.toolchain import ToolchainType
+from project.toolset import ToolchainType
from project.utils import env
diff --git a/project/cmake/build.py b/project/cmake/build.py
index 74eb820..b6f3e85 100644
--- a/project/cmake/build.py
+++ b/project/cmake/build.py
@@ -27,10 +27,10 @@ import os.path
import sys
import tempfile
-from project.cmake.toolchain import Toolchain
+from project.cmake.toolset import Toolchain
from project.configuration import Configuration
from project.platform import Platform
-from project.toolchain import ToolchainType
+from project.toolset import ToolchainType
from project.utils import normalize_path, mkdir_parent, run, setup_logging
diff --git a/project/cmake/toolchain.py b/project/cmake/toolset.py
index c12ee84..0bf8e64 100644
--- a/project/cmake/toolchain.py
+++ b/project/cmake/toolset.py
@@ -12,7 +12,7 @@ import shutil
import project.mingw
from project.os import on_windows
from project.platform import Platform
-from project.toolchain import ToolchainType
+from project.toolset import ToolchainType
class Toolchain(abc.ABC):
diff --git a/project/toolchain.py b/project/toolset.py
index f92e536..f92e536 100644
--- a/project/toolchain.py
+++ b/project/toolset.py