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;
}
Tar::Worker::Worker(const TarBall &tb):
tarball(tb)
-{
- launch();
-}
+{ }
void Tar::Worker::main()
{
- 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 TargetList &deps = tarball.get_depends();
- for(TargetList::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;