From f05a2891d3da9f9fcd9c7457ca0c2a54ff65078b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 27 Jun 2022 03:08:59 -0700
Subject: 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/)
---
 ci/build.ps1       | 4 ++--
 ci/common/build.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ci')

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
-- 
cgit