#include <stdexcept>
#include "builder.h"
#include "component.h"
-#include "externaltask.h"
#include "gnuarchiver.h"
#include "objectfile.h"
#include "sourcepackage.h"
using namespace Msp;
GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
- Tool(b, a, "AR")
+ Tool(b, &a, "AR")
{
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 &)
+Target *GnuArchiver::create_target(const vector<Target *> &sources, const string &)
{
if(sources.empty())
throw invalid_argument("GnuArchiver::create_target");
- list<ObjectFile *> objs;
+ vector<ObjectFile *> objs;
+ objs.reserve(sources.size());
for(Target *s: sources)
objs.push_back(&dynamic_cast<ObjectFile &>(*s));
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());
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;
}