Redesign how tools are run

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 53118de754963dc04095c11be4107a49c0ca9ab2..8f6b81d46b8764e82b5a9e8ba7755888e34e8576 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -10,15 +10,18 @@
 #include "builder.h"
 #include "copy.h"
 #include "installedfile.h"
+#include "internaltask.h"
 
 using namespace std;
 using namespace Msp;
 
 Copy::Copy(Builder &b):
        Tool(b, "CP")
-{ }
+{
+       set_run_internal(_run);
+}
 
-Target *Copy::create_target(const list<Target *> &sources, const string &arg)
+Target *Copy::create_target(const vector<Target *> &sources, const string &arg)
 {
        FileTarget &file_tgt = dynamic_cast<FileTarget &>(*sources.front());
        InstalledFile *inst = new InstalledFile(builder, *file_tgt.get_package(), file_tgt, arg);
@@ -26,26 +29,11 @@ Target *Copy::create_target(const list<Target *> &sources, const string &arg)
        return inst;
 }
 
-Task *Copy::run(const Target &target) const
-{
-       const InstalledFile &install = dynamic_cast<const InstalledFile &>(target);
-       Worker *worker = new Worker(install);
-       InternalTask *task = new InternalTask(worker);
-       task->add_file(install.get_path());
-       task->set_unlink();
-       return task;
-}
-
-
-Copy::Worker::Worker(const InstalledFile &t):
-       target(t)
-{ }
-
-void Copy::Worker::main()
+bool Copy::_run(const InstalledFile &install)
 {
-       const FileTarget &source = target.get_source();
+       const FileTarget &source = install.get_source();
        const FS::Path &src_path = source.get_path();
-       const FS::Path &dst_path = target.get_path();
+       const FS::Path &dst_path = install.get_path();
 
        try
        {
@@ -63,8 +51,7 @@ void Copy::Worker::main()
        catch(const exception &e)
        {
                IO::print(IO::cerr, "%s\n", e.what());
-               status = Task::ERROR;
-               return;
+               return false;
        }
 
 #ifndef _WIN32
@@ -73,7 +60,7 @@ void Copy::Worker::main()
        if(stat(src_path.str().c_str(), &st)==0)
                chmod(dst_path.str().c_str(), st.st_mode&0777);
 
-       const FS::Path &link = target.get_symlink();
+       const FS::Path &link = install.get_symlink();
        if(!link.empty())
        {
                FS::Path relpath = FS::relative(dst_path, FS::dirname(link));
@@ -83,5 +70,5 @@ void Copy::Worker::main()
        }
 #endif
 
-       status = Task::SUCCESS;
+       return true;
 }