X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=2c35ef30e1b1f3467421170df7f0f41525ffa318;hb=dad4c41302de525a1456e9d5b738831487c8acac;hp=1f764dc038045575bb526c44939fcad4ac72add5;hpb=f1c967215e6b08095bdf07518472beca3067ec37;p=builder.git diff --git a/source/copy.cpp b/source/copy.cpp index 1f764dc..2c35ef3 100644 --- a/source/copy.cpp +++ b/source/copy.cpp @@ -1,6 +1,10 @@ #include -#include -#include +#include +#include +#include +#include +#include +#include #include "builder.h" #include "copy.h" #include "package.h" @@ -8,78 +12,69 @@ using namespace std; using namespace Msp; -Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path &d): - Action(b), +Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d): + InternalAction(b), src(s), - dest(d), - worker(0) + dest(d) { - announce(pkg.get_name(), "COPY", dest[-1]); + announce(pkg.get_name(), "COPY", dest.str()); if(builder.get_verbose()>=2) - cout< "< %s\n", s, d); + if(!builder.get_dry_run()) - worker=new Worker(*this); + worker = new Worker(*this); } -int Copy::check() -{ - if(!worker) - 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); - - if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT) - { - int err=errno; - cerr<<"Can't unlink "<