X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatatool.cpp;h=b24de1396c22381ca279b9a27194f1cdc99e8541;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=4a4fc8a0cd89360d875bc7682de8c8b02afc6cd5;hpb=9e28243c9687608ec3c32954b4031490296ae877;p=builder.git

diff --git a/source/datatool.cpp b/source/datatool.cpp
index 4a4fc8a..b24de13 100644
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -1,6 +1,5 @@
 #include <stdexcept>
 #include <msp/fs/utils.h>
-#include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
 #include "datacollection.h"
@@ -16,6 +15,7 @@ using namespace Msp;
 DataTool::DataTool(Builder &b):
 	Tool(b, "DATA")
 {
+	set_command("mspdatatool");
 	input_suffixes.push_back(".mdt");
 }
 
@@ -24,7 +24,7 @@ Target *DataTool::create_source(const Component &comp, const FS::Path &path) con
 	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")
 	{
@@ -37,9 +37,12 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
 	}
 	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;
@@ -48,11 +51,20 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
 		throw invalid_argument("DataTool::create_target");
 }
 
-void DataTool::do_prepare()
+string DataTool::create_build_signature(const BuildInfo &binfo) const
 {
-	executable = builder.get_vfs().find_binary("mspdatatool");
-	if(!executable)
-		builder.problem(string(), format("Can't find executable mspdatatool for tool %s", tag));
+	string result = Tool::create_build_signature(binfo);
+	if(binfo.debug || binfo.optimize)
+		result += ',';
+	if(binfo.debug)
+		result += 'g';
+	if(binfo.optimize>0)
+	{
+		result += 'b';
+		if(binfo.optimize>1)
+			result += 'z';
+	}
+	return result;
 }
 
 Task *DataTool::run(const Target &tgt) const
@@ -66,7 +78,8 @@ Task *DataTool::run(const Target &tgt) const
 	argv.push_back("-o");
 	argv.push_back(FS::relative(dynamic_cast<const FileTarget &>(tgt).get_path(), work_dir).str());
 
-	const BuildInfo &binfo = comp.get_build_info();
+	BuildInfo binfo;
+	tgt.collect_build_info(binfo);
 	if(binfo.debug)
 		argv.push_back("-g");
 	if(binfo.optimize>0)
@@ -84,9 +97,8 @@ Task *DataTool::run(const Target &tgt) const
 	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);