diff options
Diffstat (limited to '')
| -rw-r--r-- | .github/actions/build-example/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/basic.yml | 6 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | docs/ci.md | 6 | ||||
| -rw-r--r-- | project/build.py (renamed from project/cmake/build.py) | 2 | ||||
| -rw-r--r-- | project/ci/cmake.py | 2 | ||||
| -rw-r--r-- | project/ci/dirs.py | 2 | ||||
| -rw-r--r-- | project/cmake/__init__.py | 0 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/.github/actions/build-example/action.yml b/.github/actions/build-example/action.yml index ba7b43f..63dd6b0 100644 --- a/.github/actions/build-example/action.yml +++ b/.github/actions/build-example/action.yml @@ -65,5 +65,5 @@ runs: $args += '--',$src_dir,'TMP' $env:VERBOSE = 1 - & $python -m project.cmake.build $args + & $python -m project.build $args shell: pwsh diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index d5db93d..821c205 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -53,7 +53,7 @@ jobs: - name: Build example project run: | $src_dir = Join-Path examples boost - python -m project.cmake.build --boost boost/ --install install/ -- $src_dir build/ + python -m project.build --boost boost/ --install install/ -- $src_dir build/ - name: Run example project run: ./.ci/run_foo.ps1 (Join-Path (Get-Location).Path install bin foo) @@ -90,7 +90,7 @@ jobs: run: | boost-download --version boost-build --version - cmake-build --version + project-build --version - name: Build Boost run: | boost-download --cache . '${{ matrix.boost-version }}' boost/ @@ -98,7 +98,7 @@ jobs: - name: Build example project run: | $src_dir = Join-Path examples boost - cmake-build --boost boost/ --install install/ -- $src_dir build/ + project-build --boost boost/ --install install/ -- $src_dir build/ - name: Run example project run: ./.ci/run_foo.ps1 (Join-Path (Get-Location).Path install bin foo) @@ -25,7 +25,7 @@ Installation | -------------- | ------ | boost-download | `python3 -m project.boost.download` | boost-build | `python3 -m project.boost.build` - | cmake-build | `python3 -m project.cmake.build` + | project-build | `python3 -m project.build` | ci-boost | `python3 -m project.ci.boost` | ci-cmake | `python3 -m project.ci.cmake` @@ -54,7 +54,7 @@ All of those are verified continuously by the [Boost (toolsets)] and [Examples (toolsets)] workflows. For a complete list of possible `--toolset` parameter values, pass the -`--help-toolsets` flag to either `boost-build` or `cmake-build`. +`--help-toolsets` flag to either `boost-build` or `project-build`. [Boost (toolsets)]: https://github.com/egor-tensin/cmake-common/actions/workflows/boost_toolsets.yml [Examples (toolsets)]: https://github.com/egor-tensin/cmake-common/actions/workflows/example_toolsets.yml @@ -78,7 +78,7 @@ Pass the `--help` flag to view detailed usage information. Build (and optionally, install) a CMake project. - $ cmake-build --configuration Release --install path/to/somewhere --boost path/to/boost -- examples/simple build/ + $ project-build --configuration Release --install path/to/somewhere --boost path/to/boost -- examples/simple build/ ... $ ./path/to/somewhere/bin/foo @@ -1,6 +1,6 @@ `ci-boost` and `ci-cmake` are thin wrappers around `boost-download`/`boost-build` -and `cmake-build` accordingly. They work by reading environment variables and -passing their values as command line parameters to the more generic scripts. +and `project-build` accordingly. They work by reading environment variables +and passing their values as command line parameters to the more generic scripts. This facilitates matrix-building the project without too much fuss. For example, the following Travis workflow: @@ -37,7 +37,7 @@ boost-build \ --with-filesystem for configuration in Debug Release; do - cmake-build \ + project-build \ --platform x64 \ --configuration "$configuration" \ --boost "$TRAVIS_BUILD_DIR/../build/boost" \ diff --git a/project/cmake/build.py b/project/build.py index ef4de1a..ff366c3 100644 --- a/project/cmake/build.py +++ b/project/build.py @@ -12,7 +12,7 @@ but written in bash and PowerShell, respectively). A simple usage example: - $ cmake-build --configuration Release --install path/to/somewhere -- examples/simple build/ + $ project-build --configuration Release --install path/to/somewhere -- examples/simple build/ ... $ ./path/to/somewhere/bin/foo diff --git a/project/ci/cmake.py b/project/ci/cmake.py index 13929f7..24fe34c 100644 --- a/project/ci/cmake.py +++ b/project/ci/cmake.py @@ -8,7 +8,7 @@ import os.path import sys from project.ci.dirs import Dirs -from project.cmake.build import BuildParameters, build +from project.build import BuildParameters, build from project.utils import setup_logging import project.version diff --git a/project/ci/dirs.py b/project/ci/dirs.py index eb4651b..6de9509 100644 --- a/project/ci/dirs.py +++ b/project/ci/dirs.py @@ -108,7 +108,7 @@ The supported CI systems are: {Dirs.join_ci_names()}. def get_cmake_help(): return f'''Build a CMake project during a CI run. -This is similar to running project.cmake.build, but auto-fills some parameters +This is similar to running project.build, but auto-fills some parameters from environment variables. The supported CI systems are: {Dirs.join_ci_names()}. diff --git a/project/cmake/__init__.py b/project/cmake/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/project/cmake/__init__.py +++ /dev/null diff --git a/pyproject.toml b/pyproject.toml index 6ee788c..87e8c3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ boost-build = "project.boost.build:_main" boost-download = "project.boost.download:_main" ci-boost = "project.ci.boost:main" ci-cmake = "project.ci.cmake:main" -cmake-build = "project.cmake.build:main" +project-build = "project.build:main" [tool.setuptools] script-files = [ |