Adjust build signatures to contain the tool tag

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index ca2f2e49aaef3738cd2bf2c12171af03d902c746..75d52aaac8506d23007cd343acee69ce08ba122a 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -37,6 +37,8 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
        }
        else if(arg=="pack")
        {
+               if(sources.empty())
+                       throw invalid_argument("DataTool::create_target");
                list<FileTarget *> files;
                for(Target *t: sources)
                        files.push_back(&dynamic_cast<FileTarget &>(*t));
@@ -50,7 +52,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)