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")
{
}
else if(arg=="pack")
{
- list<FileTarget *> files;
- for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
- files.push_back(&dynamic_cast<FileTarget &>(**i));
+ if(sources.empty())
+ throw invalid_argument("DataTool::create_target");
+ 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);
pack->set_tool(*this);
return pack;
string DataTool::create_build_signature(const BuildInfo &binfo) const
{
- string result;
+ string result = Tool::create_build_signature(binfo);
+ if(binfo.debug || binfo.optimize)
+ result += ',';
if(binfo.debug)
result += 'g';
if(binfo.optimize>0)
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());
else if(const DataPack *pack = dynamic_cast<const DataPack *>(&tgt))
{
argv.push_back("-p");
- const DataPack::FileList &files = pack->get_files();
- for(DataPack::FileList::const_iterator i=files.begin(); i!=files.end(); ++i)
- argv.push_back(FS::relative((*i)->get_path(), work_dir).str());
+ for(const FileTarget *f: pack->get_files())
+ argv.push_back(FS::relative(f->get_path(), work_dir).str());
}
return new ExternalTask(argv, work_dir);