X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=dc0b78494c90f4293ba3fa50379cbf12a2a3d479;hb=edd4771292a2273080fbcbac266c6831834b0b86;hp=3499204954593db5587280e5d1679b514f2e2215;hpb=33d74db3e99f35a8984d4ad9b703f709d07d44c5;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 3499204..dc0b784 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -1,11 +1,9 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/strings/format.h>
 #include <stdexcept>
 #include "builder.h"
 #include "component.h"
-#include "externaltask.h"
 #include "gnuarchiver.h"
 #include "objectfile.h"
 #include "sourcepackage.h"
@@ -15,29 +13,23 @@ using namespace std;
 using namespace Msp;
 
 GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
-	Tool(b, a, "AR")
+	Tool(b, &a, "AR")
 {
-	string command = "ar";
-	if(architecture->is_cross())
-		command = format("%s-%s", architecture->get_cross_prefix(), command);
-	executable = builder.get_vfs().find_binary(command);
-
+	set_command("ar", true);
 	input_suffixes.push_back(".o");
+	processing_unit = COMPONENT;
+	set_run_external(_run);
 }
 
-Target *GnuArchiver::create_target(const list<Target *> &sources, const string &) const
+Target *GnuArchiver::create_target(const vector<Target *> &sources, const string &)
 {
 	if(sources.empty())
 		throw invalid_argument("GnuArchiver::create_target");
 
-	list<ObjectFile *> objs;
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-	{
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
-			objs.push_back(obj);
-		else
-			throw invalid_argument("GnuArchiver::create_target");
-	}
+	vector<ObjectFile *> objs;
+	objs.reserve(sources.size());
+	for(Target *s: sources)
+		objs.push_back(&dynamic_cast<ObjectFile &>(*s));
 
 	const Component &comp = *objs.front()->get_component();
 	StaticLibrary *lib = new StaticLibrary(builder, comp, objs);
@@ -45,23 +37,19 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 	return lib;
 }
 
-Task *GnuArchiver::run(const Target &target) const
+ExternalTask::Arguments GnuArchiver::_run(const StaticLibrary &lib, FS::Path &work_dir)
 {
-	const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
-	const Component &comp = *lib.get_component();
+	const Tool &tool = *lib.get_tool();
 
 	vector<string> argv;
-	argv.push_back(executable->get_path().str());
+	argv.push_back(tool.get_executable()->get_path().str());
 	argv.push_back("rc");
 
-	FS::Path work_dir = comp.get_package().get_source_directory();
-
 	argv.push_back(relative(lib.get_path(), work_dir).str());
 
-	const Target::Dependencies &deps = lib.get_dependencies();
-	for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+	for(Target *d: lib.get_dependencies())
+		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
 
-	return new ExternalTask(argv, work_dir);
+	return argv;
 }