From deefa3d17b695ab8462fa40521690a312aae96cc Mon Sep 17 00:00:00 2001
From: Christoffer Lerno <christoffer@aegik.com>
Date: Tue, 27 Feb 2024 21:53:01 +0100
Subject: [PATCH] Add --output-dir #1155

---
 releasenotes.md           |  1 +
 src/build/build.h         |  1 +
 src/build/build_options.c |  8 ++++++++
 src/build/builder.c       |  1 +
 src/compiler/compiler.c   | 28 +++++++++++++++++++++++++---
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/releasenotes.md b/releasenotes.md
index 31d5a4db0..c5a939610 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -11,6 +11,7 @@
 - 'rgba' also available for swizzling.
 - The name "subarray" has been replaced by the more well known name "slice' across the codebase.
 - Improved alignment handling.
+- Add `--output-dir` to command line. #1155
 
 ### Fixes
 - Fixed issue in safe mode when converting enums.
diff --git a/src/build/build.h b/src/build/build.h
index 393e99754..6cba1c8b0 100644
--- a/src/build/build.h
+++ b/src/build/build.h
@@ -356,6 +356,7 @@ typedef struct BuildOptions_
 	const char *testfn;
 	const char *cc;
 	const char *build_dir;
+	const char *output_dir;
 	const char *llvm_out;
 	const char *asm_out;
 	const char *obj_out;
diff --git a/src/build/build_options.c b/src/build/build_options.c
index 1cf807241..b14d342ff 100644
--- a/src/build/build_options.c
+++ b/src/build/build_options.c
@@ -99,6 +99,7 @@ static void usage(void)
 	OUTPUT("  -D <name>                 - Add feature flag <name>.");
 	OUTPUT("  -U <name>                 - Remove feature flag <name>.");
 	OUTPUT("  --trust=<option>          - Trust level: none (default), include ($include allowed), full ($exec / exec allowed).");
+	OUTPUT("  --output-dir <dir>        - Override general output directory.");
 	OUTPUT("  --build-dir <dir>         - Override build output directory.");
 	OUTPUT("  --obj-out <dir>           - Override object file output directory.");
 	OUTPUT("  --script-dir <dir>        - Override the base directory for $exec.");
@@ -931,6 +932,12 @@ static void parse_option(BuildOptions *options)
 				options->macos.min_version = next_arg();
 				return;
 			}
+			if (match_longopt("output-dir"))
+			{
+				if (at_end() || next_is_opt()) error_exit("error: --output-dir needs a directory.");
+				options->output_dir = next_arg();
+				return;
+			}
 			if (match_longopt("build-dir"))
 			{
 				if (at_end() || next_is_opt()) error_exit("error: --build-dir needs a directory.");
@@ -1096,6 +1103,7 @@ BuildOptions parse_arguments(int argc, const char *argv[])
 		.single_module = SINGLE_MODULE_NOT_SET,
 		.files = NULL,
 		.build_dir = NULL,
+		.output_dir = NULL,
 		.script_dir = NULL,
 
 	};
diff --git a/src/build/builder.c b/src/build/builder.c
index e2d56e70c..8b177066f 100644
--- a/src/build/builder.c
+++ b/src/build/builder.c
@@ -293,6 +293,7 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 	target->emit_llvm = options->emit_llvm;
 	target->build_threads = options->build_threads;
 	target->emit_asm = options->emit_asm;
+	if (options->output_dir) target->output_dir = options->output_dir;
 	if (options->panicfn) target->panicfn = options->panicfn;
 	if (options->testfn) target->testfn = options->testfn;
 	if (options->benchfn) target->benchfn = options->benchfn;
diff --git a/src/compiler/compiler.c b/src/compiler/compiler.c
index bd68ad080..8259c85a4 100644
--- a/src/compiler/compiler.c
+++ b/src/compiler/compiler.c
@@ -304,6 +304,15 @@ void compiler_parse(void)
 	compiler_parsing_time = bench_mark();
 }
 
+static void create_output_dir(const char *dir)
+{
+	if (!file_exists(dir))
+	{
+		if (!dir_make(dir)) error_exit("Failed to create output directory %s.", dir);
+	}
+	if (!file_is_dir(dir)) error_exit("Output directory is not a directory %s.", dir);
+}
+
 void compiler_compile(void)
 {
 	sema_analysis_run();
@@ -486,11 +495,16 @@ void compiler_compile(void)
 
 	if (output_exe)
 	{
-		if (active_target.output_dir) output_exe = file_append_path(active_target.output_dir, output_exe);
+		if (active_target.output_dir)
+		{
+			create_output_dir(active_target.output_dir);
+			output_exe = file_append_path(active_target.output_dir, output_exe);
+		}
 		if (file_is_dir(output_exe))
 		{
 			error_exit("Cannot create exe with the name '%s' - there is already a directory with that name.", output_exe);
 		}
+
 		bool system_linker_available = link_libc() && platform_target.os != OS_TYPE_WIN32;
 		bool use_system_linker = system_linker_available && active_target.arch_os_target == default_target;
 		switch (active_target.system_linker)
@@ -542,7 +556,11 @@ void compiler_compile(void)
 	}
 	else if (output_static)
 	{
-		if (active_target.output_dir) output_static = file_append_path(active_target.output_dir, output_static);
+		if (active_target.output_dir)
+		{
+			create_output_dir(active_target.output_dir);
+			output_static = file_append_path(active_target.output_dir, output_static);
+		}
 		if (file_is_dir(output_static))
 		{
 			error_exit("Cannot create a static library with the name '%s' - there is already a directory with that name.", output_exe);
@@ -558,7 +576,11 @@ void compiler_compile(void)
 	}
 	else if (output_dynamic)
 	{
-		if (active_target.output_dir) output_dynamic = file_append_path(active_target.output_dir, output_dynamic);
+		if (active_target.output_dir)
+		{
+			create_output_dir(active_target.output_dir);
+			output_dynamic = file_append_path(active_target.output_dir, output_dynamic);
+		}
 		if (file_is_dir(output_dynamic))
 		{
 			error_exit("Cannot create a dynamic library with the name '%s' - there is already a directory with that name.", output_exe);