diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-28 17:19:43 +0000 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-03-28 17:23:15 +0000 |
commit | 70da99e4f70845da37ae368c4788ecc18546792d (patch) | |
tree | 51f50290e2ea926350c88fa5fa0e8d4d2ad426fa /project/ci | |
parent | common.cmake: account for ALIAS targets (diff) | |
download | cmake-common-70da99e4f70845da37ae368c4788ecc18546792d.tar.gz cmake-common-70da99e4f70845da37ae368c4788ecc18546792d.zip |
WIP: restructure
A stupid attempt to reduce code duplication led me to believe that all
the scripts could use _a bit_ of refactoring.
This is going to be a major pain (factoring out all the things), which
I'll take gladly.
All the links and usage examples are broken right now, but nobody cares,
so whatevs.
Diffstat (limited to '')
-rw-r--r-- | project/ci/__init__.py | 0 | ||||
-rw-r--r-- | project/ci/appveyor/__init__.py | 0 | ||||
-rw-r--r-- | project/ci/appveyor/boost.py (renamed from boost/build/ci/appveyor.py) | 7 | ||||
-rw-r--r--[-rwxr-xr-x] | project/ci/appveyor/cmake.py (renamed from cmake/build/ci/appveyor.py) | 7 | ||||
-rw-r--r-- | project/ci/travis/__init__.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | project/ci/travis/boost.py (renamed from boost/build/ci/travis.py) | 7 | ||||
-rw-r--r--[-rwxr-xr-x] | project/ci/travis/cmake.py (renamed from cmake/build/ci/travis.py) | 7 |
7 files changed, 8 insertions, 20 deletions
diff --git a/project/ci/__init__.py b/project/ci/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/ci/__init__.py diff --git a/project/ci/appveyor/__init__.py b/project/ci/appveyor/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/ci/appveyor/__init__.py diff --git a/boost/build/ci/appveyor.py b/project/ci/appveyor/boost.py index 4a55e20..4218dd6 100644 --- a/boost/build/ci/appveyor.py +++ b/project/ci/appveyor/boost.py @@ -21,6 +21,8 @@ import os import os.path import sys +from project.boost.build import BoostVersion, main as build_main + def _env(name): if name not in os.environ: @@ -80,11 +82,6 @@ def build_appveyor(argv=None): args = _parse_args(argv) _check_appveyor() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import BoostVersion, main as build_main - version = BoostVersion.from_string(_get_boost_version()) appveyor_argv = [ 'download', diff --git a/cmake/build/ci/appveyor.py b/project/ci/appveyor/cmake.py index b9141ec..e1ebce0 100755..100644 --- a/cmake/build/ci/appveyor.py +++ b/project/ci/appveyor/cmake.py @@ -19,6 +19,8 @@ import logging import os import sys +from project.cmake.build import build + class Image(Enum): VS_2013 = 'Visual Studio 2013' @@ -132,11 +134,6 @@ def build_appveyor(argv=None): args = _parse_args(argv) _check_appveyor() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import build - appveyor_argv = [ '--build', _get_build_dir(), '--configuration', _get_configuration(), diff --git a/project/ci/travis/__init__.py b/project/ci/travis/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/ci/travis/__init__.py diff --git a/boost/build/ci/travis.py b/project/ci/travis/boost.py index 7bbb18d..46ae96b 100755..100644 --- a/boost/build/ci/travis.py +++ b/project/ci/travis/boost.py @@ -19,6 +19,8 @@ import os import os.path import sys +from project.boost.build import BoostVersion, main as build_main + def _env(name): if name not in os.environ: @@ -78,11 +80,6 @@ def build_travis(argv=None): args = _parse_args(argv) _check_travis() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import BoostVersion, main as build_main - version = BoostVersion.from_string(_get_boost_version()) travis_argv = [ 'download', diff --git a/cmake/build/ci/travis.py b/project/ci/travis/cmake.py index ab93711..7a1f707 100755..100644 --- a/cmake/build/ci/travis.py +++ b/project/ci/travis/cmake.py @@ -19,6 +19,8 @@ import os import os.path import sys +from project.cmake.build import build + def _env(name): if name not in os.environ: @@ -69,11 +71,6 @@ def build_travis(argv=None): args = _parse_args(argv) _check_travis() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import build - travis_argv = [ '--build', _get_build_dir(), '--configuration', _get_configuration(), |