Refactor InternalTask to take a functor

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index 49b4c0851fd9b26f74df1c4c557af80d3c3ae432..446aa922a0c6baba68209219b800f57fc3dd0f61 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -4,6 +4,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include "builder.h"
+#include "internaltask.h"
 #include "sourcepackage.h"
 #include "tar.h"
 #include "tarball.h"
@@ -13,17 +14,20 @@ using namespace Msp;
 
 Tar::Tar(Builder &b):
        Tool(b, "TAR")
-{ }
+{
+       processing_unit = COMPONENT;
+}
 
-Target *Tar::create_target(const list<Target *> &sources, const string &arg) const
+Target *Tar::create_target(const vector<Target *> &sources, const string &arg)
 {
-       if(!sources.front()->get_package())
+       if(sources.empty() || !sources.front()->get_package())
                throw invalid_argument("Tar::create_target");
-       const SourcePackage &src_pkg = dynamic_cast<const SourcePackage &>(*sources.front()->get_package());
 
-       TarBall *tarball = new TarBall(builder, src_pkg, arg);
-       for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-               tarball->add_depend(*i);
+       TarBall *tarball = new TarBall(builder, *sources.front()->get_package(), arg);
+       for(Target *s: sources)
+               tarball->add_dependency(*s);
+
+       tarball->set_tool(*this);
 
        return tarball;
 }
@@ -31,25 +35,18 @@ Target *Tar::create_target(const list<Target *> &sources, const string &arg) con
 Task *Tar::run(const Target &target) const
 {
        const TarBall &tarball = dynamic_cast<const TarBall &>(target);
-       Worker *worker = new Worker(tarball);
-       return new InternalTask(worker);
+       return new InternalTask([&tarball]{ return _run(tarball); });
 }
 
-
-Tar::Worker::Worker(const TarBall &tb):
-       tarball(tb)
-{ }
-
-void Tar::Worker::main()
+bool Tar::_run(const TarBall &tarball)
 {
-       const FS::Path &pkg_src = tarball.get_package()->get_source();
+       const FS::Path &pkg_src = tarball.get_package()->get_source_directory();
        FS::Path basedir = FS::basepart(FS::basename(tarball.get_path()));
 
        IO::File out(tarball.get_path().str(), IO::M_WRITE);
-       const Target::Dependencies &deps = tarball.get_depends();
-       for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+       for(Target *d: tarball.get_dependencies())
        {
-               FileTarget *ft = dynamic_cast<FileTarget *>(*i);
+               FileTarget *ft = dynamic_cast<FileTarget *>(d);
                if(!ft)
                        continue;
 
@@ -60,8 +57,7 @@ void Tar::Worker::main()
                if(rel_path.size()>99)
                {
                        IO::print("Can't store %s in tar archive - too long name\n", rel_path);
-                       status = Task::ERROR;
-                       return;
+                       return false;
                }
 
                memcpy(buf, rel_path.data(), rel_path.size());
@@ -91,10 +87,10 @@ void Tar::Worker::main()
                }
        }
 
-       status = Task::SUCCESS;
+       return true;
 }
 
-void Tar::Worker::store_number(char *buf, unsigned value, unsigned length)
+void Tar::store_number(char *buf, unsigned value, unsigned length)
 {
        for(unsigned i=length; i--;)
        {