X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftar.cpp;h=07c14ce9282f3dcab5cf26bc2aaae46acc43501d;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=d3301a0dbcb1ae1e3d0bae93689d9400c8c9c772;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/tar.cpp b/source/tar.cpp
index d3301a0..07c14ce 100644
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -4,6 +4,7 @@
 #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"
@@ -11,36 +12,36 @@
 using namespace std;
 using namespace Msp;
 
-Tar::Tar(Builder &b, const TarBall &t):
-	InternalAction(b),
-	tarball(t)
+Tar::Tar(Builder &b):
+	Tool(b, "TAR")
 {
-	string basename = FS::basename(tarball.get_path());
-	announce(tarball.get_package()->get_name(), "TAR ", basename);
-	if(builder.get_verbose()>=2)
-		IO::print("Create %s\n", basename);
-
-	if(!builder.get_dry_run())
-		worker = new Worker(*this);
+	processing_unit = COMPONENT;
+	set_run_internal(&_run);
 }
 
-
-Tar::Worker::Worker(Tar &t):
-	tar(t)
+Target *Tar::create_target(const vector<Target *> &sources, const string &arg)
 {
-	launch();
+	if(sources.empty() || !sources.front()->get_package())
+		throw invalid_argument("Tar::create_target");
+
+	TarBall *tarball = new TarBall(builder, *sources.front()->get_package(), arg);
+	for(Target *s: sources)
+		tarball->add_dependency(*s);
+
+	tarball->set_tool(*this);
+
+	return tarball;
 }
 
-void Tar::Worker::main()
+bool Tar::_run(const TarBall &tarball)
 {
-	const FS::Path &pkg_src = tar.tarball.get_package()->get_source();
-	FS::Path basedir = FS::basepart(FS::basename(tar.tarball.get_path()));
+	const FS::Path &pkg_src = tarball.get_package()->get_source_directory();
+	FS::Path basedir = FS::basepart(FS::basename(tarball.get_path()));
 
-	IO::File out(tar.tarball.get_path().str(), IO::M_WRITE);
-	const TargetList &deps = tar.tarball.get_depends();
-	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+	IO::File out(tarball.get_path().str(), IO::M_WRITE);
+	for(Target *d: tarball.get_dependencies())
 	{
-		FileTarget *ft = dynamic_cast<FileTarget *>(*i);
+		FileTarget *ft = dynamic_cast<FileTarget *>(d);
 		if(!ft)
 			continue;
 
@@ -51,8 +52,7 @@ void Tar::Worker::main()
 		if(rel_path.size()>99)
 		{
 			IO::print("Can't store %s in tar archive - too long name\n", rel_path);
-			error = true;
-			break;
+			return false;
 		}
 
 		memcpy(buf, rel_path.data(), rel_path.size());
@@ -82,10 +82,10 @@ void Tar::Worker::main()
 		}
 	}
 
-	done = true;
+	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--;)
 	{