X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftar.cpp;h=346638ea1f69b6eb534ec84be9ad5afbc22ebcb3;hb=93271c5c0a98290a0badec8346e264ce937d8092;hp=3bcf3cbc5fb1ebab8d83b3dd352af2c955518a15;hpb=ad88e1ba08cf798e5f87796021c947cf500a02e1;p=builder.git

diff --git a/source/tar.cpp b/source/tar.cpp
index 3bcf3cb..346638e 100644
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -13,16 +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");
 
 	TarBall *tarball = new TarBall(builder, *sources.front()->get_package(), arg);
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-		tarball->add_depend(*i);
+	for(Target *s: sources)
+		tarball->add_dependency(*s);
+
+	tarball->set_tool(*this);
 
 	return tarball;
 }
@@ -41,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;