From dafd592cf44c184f9d24e2216bbed5c23e4b23c2 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Tue, 7 Jun 2022 18:06:57 +0200
Subject: Refactor the way task names are looked up.

---
 src/task_so.cc | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'src/task_so.cc')

diff --git a/src/task_so.cc b/src/task_so.cc
index 44340dd..34de2bb 100644
--- a/src/task_so.cc
+++ b/src/task_so.cc
@@ -15,16 +15,16 @@ TaskSO::TaskSO(const BuildConfiguration& config,
                const Settings& settings,
                const std::string& target,
                const std::vector<std::string>& objects,
-               const std::string& sourcePath)
-	: Task(config)
+               const std::string& sourceDir)
+	: Task(config, settings, sourceDir)
 	, config(config)
 	, settings(settings)
+	, sourceDir(sourceDir)
 {
-	std::filesystem::path base = settings.builddir;
-	base /= sourcePath;
-	std::filesystem::create_directories(base);
+	std::filesystem::path base = sourceDir;
+	std::filesystem::create_directories(std::filesystem::path(settings.builddir) / base);
 
-	targetFile = base / target;
+	_targetFile = base / target;
 	for(const auto& object : objects)
 	{
 		std::filesystem::path objectFile = object;
@@ -39,7 +39,7 @@ TaskSO::TaskSO(const BuildConfiguration& config,
 		depFiles.push_back(depFile);
 	}
 
-	flagsFile = base / targetFile.stem();
+	flagsFile = std::filesystem::path(settings.builddir) / cleanUp(sourceDir) / targetFile().stem();
 	flagsFile += ".flags";
 
 	target_type = TargetType::DynamicLibrary;
@@ -57,7 +57,7 @@ TaskSO::TaskSO(const BuildConfiguration& config,
 
 bool TaskSO::dirtyInner()
 {
-	if(!std::filesystem::exists(targetFile))
+	if(!std::filesystem::exists(targetFile()))
 	{
 		return true;
 	}
@@ -87,7 +87,7 @@ int TaskSO::runInner()
 	args.push_back("-shared");
 
 	args.push_back("-o");
-	args.push_back(targetFile.string());
+	args.push_back(targetFile().string());
 
 	for(const auto& task : getDependsTasks())
 	{
@@ -111,7 +111,7 @@ int TaskSO::runInner()
 
 	if(settings.verbose == 0)
 	{
-		std::cout << "LD => " << targetFile.string() << "\n";
+		std::cout << "LD => " << targetFile().string() << "\n";
 	}
 
 	auto tool = compiler();
@@ -120,10 +120,10 @@ int TaskSO::runInner()
 
 int TaskSO::clean()
 {
-	if(std::filesystem::exists(targetFile))
+	if(std::filesystem::exists(targetFile()))
 	{
-		std::cout << "Removing " << targetFile.string() << "\n";
-		std::filesystem::remove(targetFile);
+		std::cout << "Removing " << targetFile().string() << "\n";
+		std::filesystem::remove(targetFile());
 	}
 
 	if(std::filesystem::exists(flagsFile))
@@ -153,7 +153,12 @@ std::vector<std::string> TaskSO::depends() const
 
 std::string TaskSO::target() const
 {
-	return targetFile.string();
+	return _targetFile.string();
+}
+
+std::filesystem::path TaskSO::targetFile() const
+{
+	return std::filesystem::path(settings.builddir) / sourceDir / _targetFile;
 }
 
 bool TaskSO::derived() const
-- 
cgit v1.2.3