Replace basic for loops with range-based loops or algorithms

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index eeeec4ea68b30706a670c6b84ffd0af98d64cfdf..ca2f2e49aaef3738cd2bf2c12171af03d902c746 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -15,6 +15,7 @@ using namespace Msp;
 DataTool::DataTool(Builder &b):
        Tool(b, "DATA")
 {
+       set_command("mspdatatool");
        input_suffixes.push_back(".mdt");
 }
 
@@ -37,8 +38,8 @@ 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));
+               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;
@@ -47,9 +48,18 @@ 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
 {
-       set_executable("mspdatatool");
+       string 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
@@ -63,7 +73,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)
@@ -81,9 +92,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);