X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftar.cpp;h=6dee843df7ef4de8bee1baae45509a7fb2f34699;hb=4e2a160d94ca808cfb511cc2d38e115d989809f2;hp=82330caa9762f34531be65b56fcffcdd2b2eb3f6;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/tar.cpp b/source/tar.cpp
index 82330ca..6dee843 100644
--- 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())
 		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);
+	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);
+		tarball->add_dependency(**i);
+
+	tarball->set_tool(*this);
 
 	return tarball;
 }
@@ -38,18 +41,16 @@ Task *Tar::run(const Target &target) const
 
 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)
+	const Target::Dependencies &deps = tarball.get_dependencies();
+	for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 	{
 		FileTarget *ft = dynamic_cast<FileTarget *>(*i);
 		if(!ft)