From bfea21078e04a542e48bcf7c111ef4c3912e3049 Mon Sep 17 00:00:00 2001
From: Stefan Stefanov <stefan.karolev1@gmail.com>
Date: Thu, 18 Jan 2024 18:11:35 +0200
Subject: [PATCH] Refactor

---
 Makefile                  | 21 ++++++++++++++++----
 odin_runner.json          |  4 ++--
 src/command_executor.odin | 41 ++++++++++++++++++++-------------------
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 7b76a03..a3b91ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,28 @@
 build: clean
-	mkdir -p ./bin/
-	odin build ./src/ -out:bin/odin_runner.exe -debug
+	mkdir -p ./bin/debug/
+	odin build ./src/ -out:bin/debug/odin_runner.exe -debug
+
+build_rel: clean_rel
+	mkdir -p ./bin/release/
+	odin build ./src/ -out:bin/release/odin_runner.exe
 
 run:
-	./bin/odin_runner.exe
+	./bin/debug/odin_runner.exe
+
+run_rel:
+	./bin/release/odin_runner.exe
 
 check:
 	odin check ./src/
 
 clean:
-	rm -rf ./bin/odin_runner.*
+	rm -rf ./bin/debug/
+
+clean_rel:
+	rm -rf ./bin/release/
+
+cleanall:
+	rm -rf ./bin/
 
 nuke:
 	rm -rf ./bin
diff --git a/odin_runner.json b/odin_runner.json
index 263a324..cc34926 100644
--- a/odin_runner.json
+++ b/odin_runner.json
@@ -3,8 +3,8 @@
 		"collections": [],
 		"flags": [],
 		"source": "./src/",
-		"output_dir": "./bin/",
-		"binary_name": "binary_name.bin"
+		"output_dir": "",
+		"binary_name": ""
 	},
 	"configurations": [
 		{
diff --git a/src/command_executor.odin b/src/command_executor.odin
index 8a3c3ba..39334ab 100644
--- a/src/command_executor.odin
+++ b/src/command_executor.odin
@@ -9,6 +9,27 @@ ExecutionError :: enum {
 	None,
 	ErrorDuringCommandExecution,
 }
+
+execute_command :: proc(
+	command: Command,
+	target_name: TargetName,
+	configuration: ConfigurationTargets,
+) -> (
+	error: ExecutionError,
+) {
+	if command == .CHECK || command == .BUILD {
+		return build_or_check(command, target_name, configuration)
+	}
+	if command == .CLEAN {
+		return clean(command, target_name, configuration)
+	}
+	if command == .TEST {
+		return test(command, target_name, configuration)
+	}
+
+	return
+}
+
 build_or_check :: proc(
 	command: Command,
 	target_name: TargetName,
@@ -99,26 +120,6 @@ build_or_check :: proc(
 	return
 }
 
-execute_command :: proc(
-	command: Command,
-	target_name: TargetName,
-	configuration: ConfigurationTargets,
-) -> (
-	error: ExecutionError,
-) {
-	if command == .CHECK || command == .BUILD {
-		return build_or_check(command, target_name, configuration)
-	}
-	if command == .CLEAN {
-		return clean(command, target_name, configuration)
-	}
-	if command == .TEST {
-		return test(command, target_name, configuration)
-	}
-
-	return
-}
-
 clean :: proc(
 	command: Command,
 	target_name: TargetName,