Add class InternalAction for actions that use a thread to do their work

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 70f05398fbac5ae5dc885d7c91c8c33eb95da4ae..eea40fcdae6eda6f63dc30f09988736fa88a7fbc 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -17,46 +17,29 @@ using namespace std;
 using namespace Msp;
 
 Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path &d):
-       Action(b),
+       InternalAction(b),
        src(s),
-       dest(d),
-       worker(0)
+       dest(d)
 {
        announce(pkg.get_name(), "COPY", dest[-1]);
        if(builder.get_verbose()>=2)
                cout<<s<<" -> "<<d<<'\n';
-       
+
        if(!builder.get_dry_run())
                worker=new Worker(*this);
 }
 
-int Copy::check()
-{
-       if(!worker)  // True for dry run
-       {
-               signal_done.emit();
-               return 0;
-       }
-       
-       if(worker->get_done())
-       {
-               signal_done.emit();
-               worker->join();
-               return worker->get_error()?1:0;
-       }
-       
-       return -1;
-}
 
-Copy::~Copy()
+Copy::Worker::Worker(Copy &c):
+       copy(c)
 {
-       delete worker;
+       launch();
 }
 
 void Copy::Worker::main()
 {
        Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
-       
+
        // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
        if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
        {