#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"
Tar::Tar(Builder &b):
Tool(b, "TAR")
-{ }
+{
+ processing_unit = COMPONENT;
+ set_run_internal(&_run);
+}
-Target *Tar::create_target(const list<Target *> &sources, const string &arg)
+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");
TarBall *tarball = new TarBall(builder, *sources.front()->get_package(), arg);
- for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
- tarball->add_dependency(**i);
+ for(Target *s: sources)
+ tarball->add_dependency(*s);
tarball->set_tool(*this);
return tarball;
}
-Task *Tar::run(const Target &target) const
-{
- const TarBall &tarball = dynamic_cast<const TarBall &>(target);
- Worker *worker = new Worker(tarball);
- return new InternalTask(worker);
-}
-
-
-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_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_dependencies();
- 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;
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());
}
}
- 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--;)
{