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

diff --git a/source/datatool.cpp b/source/datatool.cpp
index ca2f2e4..b24de13 100644
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -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,7 +37,10 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
 	}
 	else if(arg=="pack")
 	{
-		list<FileTarget *> files;
+		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);
@@ -50,7 +53,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)