X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatatool.cpp;h=1bc629ebdfe60724e4b0f5b0c10712b8821cc60e;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=5ce7c02b7b21346df7b471bd04e2817e1f486e06;hpb=000deb52a1374bcedfec5d201c53c1842438ceba;p=builder.git

diff --git a/source/datatool.cpp b/source/datatool.cpp
index 5ce7c02..1bc629e 100644
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -16,6 +16,7 @@ DataTool::DataTool(Builder &b):
 	Tool(b, "DATA")
 {
 	set_command("mspdatatool");
+	set_run(_run);
 	input_suffixes.push_back(".mdt");
 }
 
@@ -24,7 +25,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 +38,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;
@@ -50,7 +54,9 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
 
 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)
@@ -62,18 +68,20 @@ string DataTool::create_build_signature(const BuildInfo &binfo) const
 	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());
 
-	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)
@@ -91,9 +99,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);