From 59a04dc0300de5dcab4754d7309f9c11c950b55b Mon Sep 17 00:00:00 2001
From: Mitya Selivanov <automainint@guattari.tech>
Date: Fri, 12 Jan 2024 19:40:11 +0100
Subject: Update build scripts

---
 .gitignore        |  2 +-
 build_and_test.sh | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 18d5ae0..000224f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/*build*/
+/out_*/
 *.swp
diff --git a/build_and_test.sh b/build_and_test.sh
index 019e05c..8da4d96 100644
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -2,7 +2,7 @@
 # General build instructions
 #
 
-FOLDER=build_gcc
+FOLDER=out_gcc
 OS=Linux
 COMPILE=gcc
 COMPILEPP=g++
@@ -14,22 +14,22 @@ FLAG_EXE="-o "
 LINK_FLAGS=
 
 if    [ "$2" = "gcc" ]; then
-  FOLDER=build_gcc
+  FOLDER=out_gcc
   COMPILE=gcc
   COMPILEPP=g++
 elif  [ "$2" = "clang" ]; then
-  FOLDER=build_clang
+  FOLDER=out_clang
   COMPILE=clang
   COMPILEPP=clang++
 elif  [ "$2" = "msvc" ]; then
-  FOLDER=build_msvc
+  FOLDER=out_msvc
   COMPILE=cl.exe
   COMPILEPP=cl.exe
   OBJ_POSTFIX=.obj
   FLAG_OBJ="-c -Fo"
   FLAG_EXE="-Fe"
 elif  [ "$2" = "emcc" ]; then
-  FOLDER=build_emcc
+  FOLDER=out_emcc
   COMPILE=emcc
   COMPILEPP=em++
   EXE_POSTFIX=.js
@@ -141,6 +141,9 @@ fi
 if [ "$COMPILE" = "clang" ] || [ "$OS" = "macOS" ]; then
   FLAGS="-fblocks ${FLAGS}"
   LINK_FLAGS="-lBlocksRuntime ${LINK_FLAGS}"
+fi
+
+if [ "$COMPILE" = "clang" ]; then
   COMPILEPP="${COMPILEPP} -stdlib=libc++"
 fi
 
@@ -165,9 +168,9 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-echo "Build kit_test_suite"
+echo "Build test suite"
 $COMPILE ${FLAGS} \
-  ${FLAG_EXE}"${FOLDER}/kit_test_suite${EXE_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/test_suite${EXE_POSTFIX}" \
   "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/_exe.c" \
   ${LINK_FLAGS}
@@ -225,7 +228,7 @@ echo ""
 
 STATUS=0
 
-${FOLDER}/kit_test_suite
+${FOLDER}/test_suite
 if [ $? -ne 0 ]; then
   STATUS=1
 fi
-- 
cgit v1.2.3