Check for empty sources in Tar::create_target

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index 49b4c0851fd9b26f74df1c4c557af80d3c3ae432..346638ea1f69b6eb534ec84be9ad5afbc22ebcb3 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -13,17 +13,20 @@ using namespace Msp;
 
 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 list<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;
 }
@@ -42,14 +45,13 @@ Tar::Worker::Worker(const TarBall &tb):
 
 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 Target::Dependencies &deps = tarball.get_depends();
-       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;