From 004f089cf09df26c5e4ffd6d8556e362cc99cc1f Mon Sep 17 00:00:00 2001
From: Eric-Paul Ickhorn <ericp.ickhorn@gmail.com>
Date: Sun, 8 Sep 2024 16:45:20 +0200
Subject: [PATCH] Modify build-script include folder keys

The key for getting the path of  the own module in the includes.txt is
no  longer '{self}', but rather '{module}', as that is a little easier
to understand.
---
 modules/assets/includes.txt   |  2 +-
 modules/ecs/includes.txt      |  2 +-
 modules/renderer/includes.txt |  2 +-
 modules/utility/includes.txt  |  2 +-
 modules/window/includes.txt   |  2 +-
 modules/world/includes.txt    |  2 +-
 scripts/build.bash            | 12 ++++++++++--
 7 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/assets/includes.txt b/modules/assets/includes.txt
index 7870910..e206f9f 100644
--- a/modules/assets/includes.txt
+++ b/modules/assets/includes.txt
@@ -1,3 +1,3 @@
-{self}/inc-c
+{module}/inc-c
 {module-folder}/utility/inc-c
 {module-folder}/ecs/inc-c
\ No newline at end of file
diff --git a/modules/ecs/includes.txt b/modules/ecs/includes.txt
index 778beaa..f5a589d 100644
--- a/modules/ecs/includes.txt
+++ b/modules/ecs/includes.txt
@@ -1,2 +1,2 @@
-{self}/inc-c
+{module}/inc-c
 {module-folder}/utility/inc-c
\ No newline at end of file
diff --git a/modules/renderer/includes.txt b/modules/renderer/includes.txt
index 06d6217..dc70eb5 100644
--- a/modules/renderer/includes.txt
+++ b/modules/renderer/includes.txt
@@ -1,4 +1,4 @@
-{self}/inc-c
+{module}/inc-c
 {module-folder}/utility/inc-c
 {module-folder}/window/inc-c
 {module-folder}/ecs/inc-c
\ No newline at end of file
diff --git a/modules/utility/includes.txt b/modules/utility/includes.txt
index 39ebc60..bd38fb3 100644
--- a/modules/utility/includes.txt
+++ b/modules/utility/includes.txt
@@ -1 +1 @@
-{self}/inc-c
\ No newline at end of file
+{module}/inc-c
\ No newline at end of file
diff --git a/modules/window/includes.txt b/modules/window/includes.txt
index 7870910..e206f9f 100644
--- a/modules/window/includes.txt
+++ b/modules/window/includes.txt
@@ -1,3 +1,3 @@
-{self}/inc-c
+{module}/inc-c
 {module-folder}/utility/inc-c
 {module-folder}/ecs/inc-c
\ No newline at end of file
diff --git a/modules/world/includes.txt b/modules/world/includes.txt
index 778beaa..f5a589d 100644
--- a/modules/world/includes.txt
+++ b/modules/world/includes.txt
@@ -1,2 +1,2 @@
-{self}/inc-c
+{module}/inc-c
 {module-folder}/utility/inc-c
\ No newline at end of file
diff --git a/scripts/build.bash b/scripts/build.bash
index 2a9b5e6..b1700d7 100644
--- a/scripts/build.bash
+++ b/scripts/build.bash
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 cd $(dirname $0)
 SCRIPT_PATH=$(pwd)
@@ -42,10 +43,10 @@ function make_include_statements() {
 
     for INCLUDE_PATH in $(cat modules/$MODULE_NAME/includes.txt)
     do
-        MODIFIED_PATH="${INCLUDE_PATH//"{self}"/"$PROJECT_PATH/modules/$MODULE_NAME"}"
+        MODIFIED_PATH="${INCLUDE_PATH//"{module}"/"$PROJECT_PATH/modules/$MODULE_NAME"}"
         MODIFIED_PATH="${MODIFIED_PATH//"{module-folder}"/"$PROJECT_PATH/modules"}"
         echo "-I ${MODIFIED_PATH//"{dependencies}"/"$PROJECT_PATH/dependencies"}"
-    done    
+    done
 }
 
 function build_single_module() {
@@ -68,7 +69,14 @@ function build_single_module() {
         gcc -c -o .build/modules/$MODULE_NAME/objects/$OBJECT_NAME -g3 modules/$MODULE_NAME/src-c/$SOURCE $INCLUDE_STATEMENTS
     done
 
+    if [[ $(ls .build/modules/$MODULE_NAME/objects/ | grep ".o$") == "" ]];
+    then
+        echo "> Empty Module, not creating archive."
+        echo " "
+        return
+    fi
     ar -rvs .build/archives/voxula-$MODULE_NAME.a .build/modules/$MODULE_NAME/objects/*.o
+    echo " "
 }
 
 mkdir -p .build/archives