diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2022-06-27 03:08:59 -0700 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2022-06-28 04:02:29 -0700 |
| commit | f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b (patch) | |
| tree | de382ef0008871d7e7a41b29172b41bd97a39e05 /ci | |
| parent | 9ddb481d88d3926111e83d512921ebe98bb426ae (diff) | |
| download | rneovim-f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b.tar.gz rneovim-f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b.tar.bz2 rneovim-f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b.zip | |
build: rename build-related dirs
Problem:
Dirs "config", "packaging", and "third-party" are all closely related
but this is not obvious from the layout. This adds friction for new
contributors.
Solution:
- rename config/ to cmake.config/
- rename test/config/ to test/cmakeconfig/ because it is used in Lua
tests: require('test.cmakeconfig.paths').
- rename packaging/ to cmake.packaging/
- rename third-party/ to cmake.deps/ (parallel with .deps/)
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/build.ps1 | 4 | ||||
| -rw-r--r-- | ci/common/build.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index 99f66f7de2..767f812091 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -71,9 +71,9 @@ function convertToCmakeArgs($vars) { cd $env:DEPS_BUILD_DIR if ($bits -eq 32) { - cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed + cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/cmake.deps/" ; exitIfFailed } else { - cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed + cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/cmake.deps/" ; exitIfFailed } cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed cd $buildDir diff --git a/ci/common/build.sh b/ci/common/build.sh index b8bbff0b16..f083796a28 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -35,7 +35,7 @@ build_deps() { # update CMake configuration and update to newer deps versions. cd "${DEPS_BUILD_DIR}" echo "Configuring with '${DEPS_CMAKE_FLAGS}'." - CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/third-party/" + CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/cmake.deps/" if ! top_make; then exit 1 |