Refactor the use of external tasks in tools

[builder.git] / source / gnuarchiver.cpp

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 629cb708637c6c090d55b92a74b3df649e8280a3..dc0b78494c90f4293ba3fa50379cbf12a2a3d479 100644 (file)
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -4,7 +4,6 @@
 #include <stdexcept>
 #include "builder.h"
 #include "component.h"
-#include "externaltask.h"
 #include "gnuarchiver.h"
 #include "objectfile.h"
 #include "sourcepackage.h"
@@ -19,7 +18,7 @@ GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
        set_command("ar", true);
        input_suffixes.push_back(".o");
        processing_unit = COMPONENT;
-       set_run(_run);
+       set_run_external(_run);
 }
 
 Target *GnuArchiver::create_target(const vector<Target *> &sources, const string &)
@@ -38,22 +37,19 @@ Target *GnuArchiver::create_target(const vector<Target *> &sources, const string
        return lib;
 }
 
-Task *GnuArchiver::_run(const StaticLibrary &lib)
+ExternalTask::Arguments GnuArchiver::_run(const StaticLibrary &lib, FS::Path &work_dir)
 {
        const Tool &tool = *lib.get_tool();
-       const Component &comp = *lib.get_component();
 
        vector<string> argv;
        argv.push_back(tool.get_executable()->get_path().str());
        argv.push_back("rc");
 
-       FS::Path work_dir = comp.get_package().get_source_directory();
-
        argv.push_back(relative(lib.get_path(), work_dir).str());
 
        for(Target *d: lib.get_dependencies())
                if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
                        argv.push_back(relative(obj->get_path(), work_dir).str());
 
-       return new ExternalTask(argv, work_dir);
+       return argv;
 }