1 files changed, 44 insertions, 20 deletions

diff --git a/src/rebuild.cc b/src/rebuild.cc
index 50d7540..c97452d 100644
--- a/src/rebuild.cc
+++ b/src/rebuild.cc
@@ -7,18 +7,21 @@
 #include <filesystem>
 #include <algorithm>
 #include <source_location>
+#include <cstring>
 
 #include "configure.h"
-#include "settings.h"
-#include "libctor.h"
+#include "ctor.h"
 #include "tasks.h"
 #include "build.h"
 #include "execute.h"
+#include "tools.h"
+#include "util.h"
 
 std::array<BuildConfigurationEntry, 1024> configFiles;
 std::size_t numConfigFiles{0};
 
-int reg(BuildConfigurations (*cb)(),
+namespace ctor {
+int reg(ctor::build_configurations (*cb)(const ctor::settings&),
         const std::source_location location)
 {
 	// NOTE: std::cout cannot be used here
@@ -29,12 +32,23 @@ int reg(BuildConfigurations (*cb)(),
 		exit(1);
 	}
 
-	configFiles[numConfigFiles].file = location.file_name();
+	auto loc = std::filesystem::path(location.file_name());
+	if(loc.is_absolute())
+	{
+		auto pwd = std::filesystem::current_path();
+		auto rel = std::filesystem::relative(loc, pwd);
+		configFiles[numConfigFiles].file = strdup(rel.string().data()); // NOTE: This intentionally leaks memory
+	}
+	else
+	{
+		configFiles[numConfigFiles].file = location.file_name();
+	}
 	configFiles[numConfigFiles].cb = cb;
 	++numConfigFiles;
 
 	return 0;
 }
+} // ctor::
 
 int reg(const char* location)
 {
@@ -48,7 +62,7 @@ int reg(const char* location)
 
 	configFiles[numConfigFiles].file = location;
 	configFiles[numConfigFiles].cb =
-		[](){ return std::vector<BuildConfiguration>{}; };
+		[](const ctor::settings&){ return std::vector<ctor::build_configuration>{}; };
 	++numConfigFiles;
 
 	return 0;
@@ -97,7 +111,8 @@ int unreg(const char* location)
 std::array<ExternalConfigurationEntry, 1024> externalConfigFiles;
 std::size_t numExternalConfigFiles{0};
 
-int reg(ExternalConfigurations (*cb)(),
+namespace ctor {
+int reg(ctor::external_configurations (*cb)(const ctor::settings&),
         const std::source_location location)
 {
 	// NOTE: std::cout cannot be used here
@@ -114,10 +129,11 @@ int reg(ExternalConfigurations (*cb)(),
 
 	return 0;
 }
+} // namespace ctor::
 
 namespace
 {
-bool contains(const std::vector<Source>& sources, const std::string& file)
+bool contains(const std::vector<ctor::source>& sources, const std::string& file)
 {
 	for(const auto& source : sources)
 	{
@@ -131,7 +147,7 @@ bool contains(const std::vector<Source>& sources, const std::string& file)
 }
 }
 
-bool recompileCheck(const Settings& global_settings, int argc, char* argv[],
+bool recompileCheck(const ctor::settings& global_settings, int argc, char* argv[],
                     bool relaunch_allowed)
 {
 	using namespace std::string_literals;
@@ -141,24 +157,28 @@ bool recompileCheck(const Settings& global_settings, int argc, char* argv[],
 		std::cout << "Recompile check (" << numConfigFiles << "):\n";
 	}
 
-	BuildConfiguration config;
+	ctor::build_configuration config;
 
 	config.name = "ctor";
-	config.flags.cxxflags =
-		std::vector<std::string>({ "-s", "-O3", "-std=c++20" });
-	if(hasConfiguration(cfg::ctor_includedir))
+	config.system = ctor::output_system::build;
+
+	config.flags.cxxflags.push_back({ctor::cxx_opt::optimization, "3"});
+	config.flags.cxxflags.push_back({ctor::cxx_opt::cpp_std, "c++20"});
+
+	const auto& c = ctor::get_configuration();
+	if(c.has(ctor::cfg::ctor_includedir))
 	{
-		config.flags.cxxflags.push_back("-I"s + getConfiguration(cfg::ctor_includedir));
+		config.flags.cxxflags.push_back({ctor::cxx_opt::include_path,
+		                                 c.get(ctor::cfg::ctor_includedir)});
 	}
-	if(hasConfiguration(cfg::ctor_libdir))
+	if(c.has(ctor::cfg::ctor_libdir))
 	{
-		config.flags.ldflags.push_back("-L"s + getConfiguration(cfg::ctor_libdir));
+		config.flags.ldflags.push_back({ctor::ld_opt::library_path, c.get(ctor::cfg::ctor_libdir)});
 	}
-	config.flags.ldflags.push_back("-lctor");
-	config.flags.ldflags.push_back("-pthread");
-
+	config.flags.ldflags.push_back({ctor::ld_opt::link, "ctor"});
+	config.flags.ldflags.push_back({ctor::ld_opt::threads});
 
-	Settings settings{global_settings};
+	ctor::settings settings{global_settings};
 	settings.verbose = -1; // Make check completely silent.
 	settings.builddir += "/ctor"; // override builddir to use ctor subdir
 
@@ -229,7 +249,11 @@ bool recompileCheck(const Settings& global_settings, int argc, char* argv[],
 	if(dirty_tasks)
 	{
 		std::cout << "Rebuilding config.\n";
-		build(settings, "ctor", tasks); // run for real
+		auto ret = build(settings, "ctor", tasks); // run for real
+		if(ret != 0)
+		{
+			return ret;
+		}
 	}
 
 	if(reconfigure)