Use build directory for builds

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 69253b70a7ed6507b2af725d614af310dff43eb8..68813f9617b3adc076bae0e09f50c0f44abb122d 100644 (file)
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -45,8 +45,8 @@ jobs:
           git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME
           rm -rvf games/$MINETEST_GAME_NAME/.git
           git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt
-          mkdir cmakebuild
-          cd cmakebuild
+          mkdir build
+          cd build
           cmake .. \
             -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
             -DCMAKE_FIND_FRAMEWORK=LAST \

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index feb334bee63c735b0e7499d8b2898cad18f6c39f..626fd022bad0fbc51f6378d128ef6bfd67564b44 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,8 @@ variables:
    - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential git cmake libpng-dev libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev libleveldb-dev libogg-dev libvorbis-dev libopenal-dev libcurl4-gnutls-dev libfreetype6-dev zlib1g-dev libgmp-dev libjsoncpp-dev libzstd-dev
   script:
     - git clone https://github.com/minetest/irrlicht -b $IRRLICHT_TAG lib/irrlichtmt
-    - mkdir cmakebuild
-    - cd cmakebuild
+    - mkdir build
+    - cd build
     - cmake -DCMAKE_INSTALL_PREFIX=../artifact/minetest/usr/ -DCMAKE_BUILD_TYPE=Release -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE -DBUILD_SERVER=TRUE ..
     - make -j2
     - make install

diff --git a/README.md b/README.md
index 8f089ab4822c481ffdd15e71ce9730698cd2905e..8ecaabea0b8c37ae5102ec35cf30b6d5ca2bd261 100644 (file)
--- a/README.md
+++ b/README.md
@@ -418,8 +418,8 @@ git clone --depth 1 https://github.com/minetest/irrlicht.git lib/irrlichtmt
 #### Build
 
 ```bash
-mkdir cmakebuild
-cd cmakebuild
+mkdir build
+cd build
 
 cmake .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \

diff --git a/util/ci/build.sh b/util/ci/build.sh
index ba77cd645662b72ba244fd3144cef633014cc579..32b5c92a7a3f47d14a49b7c35803ec0413e3ad6d 100755 (executable)
--- a/util/ci/build.sh
+++ b/util/ci/build.sh
@@ -1,7 +1,7 @@
 #! /bin/bash -e
 
-mkdir cmakebuild
-cd cmakebuild
+mkdir build
+cd build
 cmake -DCMAKE_BUILD_TYPE=Debug \
        -DRUN_IN_PLACE=TRUE -DENABLE_GETTEXT=TRUE \
        -DBUILD_SERVER=TRUE ${CMAKE_FLAGS} ..

diff --git a/util/ci/clang-tidy.sh b/util/ci/clang-tidy.sh
index bb4e99fef8e3f27b465b6d35820ebb5353ccf607..74578eeac3a6f6c61d7f9069815b798d78c25c8b 100755 (executable)
--- a/util/ci/clang-tidy.sh
+++ b/util/ci/clang-tidy.sh
@@ -1,7 +1,7 @@
 #! /bin/bash -eu
 
-mkdir -p cmakebuild
-cd cmakebuild
+mkdir -p build
+cd build
 cmake -DCMAKE_BUILD_TYPE=Debug \
        -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
        -DRUN_IN_PLACE=TRUE \
@@ -12,6 +12,6 @@ make GenerateVersion
 cd ..
 
 ./util/ci/run-clang-tidy.py \
-       -clang-tidy-binary=clang-tidy-9 -p cmakebuild \
+       -clang-tidy-binary=clang-tidy-9 -p build \
        -quiet -config="$(cat .clang-tidy)" \
        'src/.*'