Refuse to create an empty data pack

[builder.git] / source / datatool.cpp

diff --git a/source/datatool.cpp b/source/datatool.cpp
index 5ce7c02b7b21346df7b471bd04e2817e1f486e06..d23c00de00f8531898c7278d50db78730e88ddc0 100644 (file)
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -37,9 +37,11 @@ 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(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;
@@ -73,7 +75,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)
@@ -91,9 +94,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);