Tool(b, "DATA")
{
set_command("mspdatatool");
+ set_run(_run);
input_suffixes.push_back(".mdt");
}
return new DataTransform(builder, comp, path);
}
-Target *DataTool::create_target(const list<Target *> &sources, const string &arg)
+Target *DataTool::create_target(const vector<Target *> &sources, const string &arg)
{
if(arg=="collection")
{
{
if(sources.empty())
throw invalid_argument("DataTool::create_target");
- list<FileTarget *> files;
+ vector<FileTarget *> files;
+ files.reserve(sources.size());
for(Target *t: sources)
files.push_back(&dynamic_cast<FileTarget &>(*t));
DataPack *pack = new DataPack(builder, *files.front()->get_component(), files);
return result;
}
-Task *DataTool::run(const Target &tgt) const
+Task *DataTool::_run(const Target &tgt)
{
+ const Tool &tool = *tgt.get_tool();
const Component &comp = *tgt.get_component();
FS::Path work_dir = comp.get_package().get_source_directory();
vector<string> argv;
- argv.push_back(executable->get_path().str());
+ argv.push_back(tool.get_executable()->get_path().str());
argv.push_back("-o");
argv.push_back(FS::relative(dynamic_cast<const FileTarget &>(tgt).get_path(), work_dir).str());