feat: Create separate build directory

enzoevers · May 14, 2024 · 53b1713 · 53b1713
1 parent 5bffd8e
commit 53b1713
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,7 @@
 #----- Begin -----
 
 build
-
-# See Scripts/Variables.sh
-Code/BuildDoc
-Code/BuildDesktop
-Code/BuildStm32*
-Code/BuildTest
+Build
 
 dist
 

diff --git a/Scripts/Desktop/BuildDesktop.sh b/Scripts/Desktop/BuildDesktop.sh
@@ -6,10 +6,12 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
+CreateBuildDirectoryIfNotExist ${BUILD_PATH}
+
 ValidateDirExists ${CODE_PATH}
 
 CreateBuildDirectoryIfNotExist ${BUILD_DIR_DESKTOP}
 
 cd ${BUILD_DIR_DESKTOP}
-cmake -G Ninja .. -DUSE_DESKTOP=ON -DHANOVER_OL037A=ON
+cmake -G Ninja ${CODE_PATH} -DUSE_DESKTOP=ON -DHANOVER_OL037A=ON
 cmake --build . --parallel 8
diff --git a/Scripts/Desktop/CleanDesktopBuild.sh b/Scripts/Desktop/CleanDesktopBuild.sh
@@ -6,6 +6,6 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
-ValidateDirExists ${CODE_PATH}
+ValidateDirExists ${BUILD_PATH}
 
 DeleteBuildDirectoryIfExist ${BUILD_DIR_DESKTOP}
diff --git a/Scripts/Doc/BuildDoc.sh b/Scripts/Doc/BuildDoc.sh
@@ -6,10 +6,12 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
+CreateBuildDirectoryIfNotExist ${BUILD_PATH}
+
 ValidateDirExists ${CODE_PATH}
 
 CreateBuildDirectoryIfNotExist ${BUILD_DIR_DOC}
 
 cd ${BUILD_DIR_DOC}
-cmake .. -DGENERATE_DOCS=ON
+cmake ${CODE_PATH} -DGENERATE_DOCS=ON
 doxygen Doc/Doxyfile.doxygen
diff --git a/Scripts/Doc/CleanDocBuild.sh b/Scripts/Doc/CleanDocBuild.sh
@@ -6,6 +6,6 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
-ValidateDirExists ${CODE_PATH}
+ValidateDirExists ${BUILD_PATH}
 
 DeleteBuildDirectoryIfExist ${BUILD_DIR_DOC}
diff --git a/Scripts/Stm32/Stm32f303xc/BuildStm32f303xc.sh b/Scripts/Stm32/Stm32f303xc/BuildStm32f303xc.sh
@@ -6,10 +6,12 @@ SCRIPT_PATH=${CUR_PATH}/../../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
+CreateBuildDirectoryIfNotExist ${BUILD_PATH}
+
 ValidateDirExists ${CODE_PATH}
 
 CreateBuildDirectoryIfNotExist ${BUILD_DIR_STM32F303XC}
 
 cd ${BUILD_DIR_STM32F303XC}
-cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Debug -DUSE_STM32=ON -DUSE_STM32F3=ON -DUSE_STM32F303XC=ON -DHANOVER_OL037A=ON
+cmake -G Ninja ${CODE_PATH} -DCMAKE_BUILD_TYPE=Debug -DUSE_STM32=ON -DUSE_STM32F3=ON -DUSE_STM32F303XC=ON -DHANOVER_OL037A=ON
 cmake --build . --parallel 8
diff --git a/Scripts/Stm32/Stm32f303xc/CleanStm32f303xcBuild.sh b/Scripts/Stm32/Stm32f303xc/CleanStm32f303xcBuild.sh
@@ -6,6 +6,6 @@ SCRIPT_PATH=${CUR_PATH}/../../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
-ValidateDirExists ${CODE_PATH}
+ValidateDirExists ${BUILD_PATH}
 
 DeleteBuildDirectoryIfExist ${BUILD_DIR_STM32F303XC}
diff --git a/Scripts/Test/BuildTest.sh b/Scripts/Test/BuildTest.sh
@@ -6,10 +6,12 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
+CreateBuildDirectoryIfNotExist ${BUILD_PATH}
+
 ValidateDirExists ${CODE_PATH}
 
 CreateBuildDirectoryIfNotExist ${BUILD_DIR_TEST}
 
 cd ${BUILD_DIR_TEST}
-CC=clang-17 CXX=clang++-17 cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Debug -DTEST_ON_PC=ON
+CC=clang-17 CXX=clang++-17 cmake -G Ninja ${CODE_PATH} -DCMAKE_BUILD_TYPE=Debug -DTEST_ON_PC=ON
 cmake --build . --parallel 8
diff --git a/Scripts/Test/CleanTestBuild.sh b/Scripts/Test/CleanTestBuild.sh
@@ -6,6 +6,6 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
-ValidateDirExists ${CODE_PATH}
+ValidateDirExists ${BUILD_PATH}
 
 DeleteBuildDirectoryIfExist ${BUILD_DIR_TEST}
diff --git a/Scripts/Test/RunTest.sh b/Scripts/Test/RunTest.sh
@@ -6,7 +6,7 @@ SCRIPT_PATH=${CUR_PATH}/../
 source ${SCRIPT_PATH}/Variables.sh
 source ${SCRIPT_PATH}/Utils.sh
 
-ValidateDirExists ${CODE_PATH}
+ValidateDirExists ${BUILD_PATH}
 
 RETURN_CODE=0
 EvaluateTests()

diff --git a/Scripts/Variables.sh b/Scripts/Variables.sh
@@ -1,16 +1,17 @@
 
 CODE_PATH="${SCRIPT_PATH}/../Code/"
+BUILD_PATH="${SCRIPT_PATH}/../Build/"
 
 # The full path to the build directory for the desktop target
-BUILD_DIR_DESKTOP="${CODE_PATH}/BuildDesktop"
+BUILD_DIR_DESKTOP="${BUILD_PATH}/BuildDesktop"
 
 # The full path to the build directory for the desktop target
-BUILD_DIR_STM32F303XC="${CODE_PATH}/BuildStm32f303xc"
+BUILD_DIR_STM32F303XC="${BUILD_PATH}/BuildStm32f303xc"
 
 # The full path to the build directory for the tests
-BUILD_DIR_TEST="${CODE_PATH}/BuildTest"
+BUILD_DIR_TEST="${BUILD_PATH}/BuildTest"
 
 # The full path to the build directory for the documentation
-BUILD_DIR_DOC="${CODE_PATH}/BuildDoc"
+BUILD_DIR_DOC="${BUILD_PATH}/BuildDoc"
 
 APPLICATION_NAME="LedDisplayDriverExecutable"