Make it possible for plugins to require other plugins

[builder.git] / source / lib / builder.cpp

diff --git a/source/lib/builder.cpp b/source/lib/builder.cpp
index 9cf6266af8fef3d03db31b9d6d81e33310220bfc..c8c7bf81efbccb47726edef19c1ae11417184103 100644 (file)
--- a/source/lib/builder.cpp
+++ b/source/lib/builder.cpp
@@ -10,6 +10,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include "binarypackage.h"
@@ -47,6 +48,7 @@ void Builder::load_plugins()
 
        FS::Path plugins_dir = FS::get_sys_lib_dir();
        logger->log("files", "Traversing %s", plugins_dir);
+       vector<LoadedPlugin> unordered_plugins;
        for(const string &f: list_filtered(plugins_dir, "\\.dlm$"))
        {
                LoadedPlugin plugin;
@@ -69,7 +71,7 @@ void Builder::load_plugins()
                        if(plugin.plugin)
                        {
                                logger->log("plugins", "Loaded plugin %s", f);
-                               plugins.emplace_back(move(plugin));
+                               unordered_plugins.emplace_back(move(plugin));
                                continue;
                        }
                        else
@@ -79,8 +81,40 @@ void Builder::load_plugins()
                {
                        logger->log("plugins", "Failed to initialize plugin %s: %s", f, exc.what());
                }
+       }
+
+       auto have_plugin = [this](const string &r){
+               return any_of(plugins.begin(), plugins.end(), [&r](const LoadedPlugin &p){ return FS::basepart(FS::basename(p.path))==r; });
+       };
+
+       while(!unordered_plugins.empty())
+       {
+               bool any_added = false;
+               for(auto i=unordered_plugins.begin(); i!=unordered_plugins.end(); )
+               {
+                       const vector<string> &required = i->plugin->get_required_plugins();
+                       if(all_of(required.begin(), required.end(), have_plugin))
+                       {
+                               plugins.push_back(move(*i));
+                               i = unordered_plugins.erase(i);
+                               any_added = true;
+                       }
+                       else
+                               ++i;
+               }
 
-               delete plugin.module;
+               if(!any_added)
+                       break;
+       }
+
+       for(const LoadedPlugin &p: unordered_plugins)
+       {
+               vector<string> missing;
+               for(const string &r: p.plugin->get_required_plugins())
+                       if(!have_plugin(r))
+                               missing.push_back(r);
+               logger->log("plugins", "Missing required plugins for plugin %s: %s",
+                       FS::basename(p.path), join(missing.begin(), missing.end()));
        }
 }
 
@@ -159,46 +193,71 @@ void Builder::set_logger(const Logger *l)
 
 vector<string> Builder::collect_problems() const
 {
+       vector<string> target_problems;
        vector<string> problems;
-       set<const Package *> broken_packages;
-       set<const Component *> broken_components;
-       set<const Tool *> broken_tools;
+       vector<const Package *> broken_packages;
+       vector<const Component *> broken_components;
+       vector<const Tool *> broken_tools;
 
        for(const auto &kvp: build_graph.get_targets())
                if(kvp.second->is_broken())
                {
-                       for(const string &p: kvp.second->get_problems())
-                               problems.push_back(format("%s: %s", kvp.second->get_name(), p));
-
                        const Package *package = kvp.second->get_package();
-                       if(package && !package->get_problems().empty())
-                               broken_packages.insert(package);
+                       if(package && package->is_broken())
+                               collect_broken_packages(*package, broken_packages);
 
                        const Component *component = kvp.second->get_component();
-                       if(component && !component->get_problems().empty())
-                               broken_components.insert(component);
+                       if(component && component->is_broken() && !any_equals(broken_components, component))
+                       {
+                               broken_components.push_back(component);
+                               collect_broken_packages(component->get_package(), broken_packages);
+                               for(const Package *r: component->get_required_packages())
+                                       if(r->is_broken())
+                                               collect_broken_packages(*r, broken_packages);
+                       }
 
                        const Tool *tool = kvp.second->get_tool();
-                       if(tool && !tool->get_problems().empty())
-                               broken_tools.insert(tool);
+                       if(tool && tool->is_broken() && !any_equals(broken_tools, tool))
+                       {
+                               broken_tools.push_back(tool);
+                               for(const string &p: tool->get_problems())
+                                       problems.push_back(format("%s: %s", tool->get_tag(), p));
+                       }
+
+                       for(const string &p: kvp.second->get_problems())
+                               target_problems.push_back(format("%s: %s", kvp.second->get_name(), p));
                }
 
-       // TODO Sort components after their packages, and targets last
        for(const Package *p: broken_packages)
+       {
                for(const string &b: p->get_problems())
                        problems.push_back(format("%s: %s", p->get_name(), b));
 
-       for(const Component *c: broken_components)
-               for(const string &b: c->get_problems())
-                       problems.push_back(format("%s/%s: %s", c->get_package().get_name(), c->get_name(), b));
+               for(const Component *c: broken_components)
+                       if(&c->get_package()==p)
+                       {
+                               for(const string &b: c->get_problems())
+                                       problems.push_back(format("%s/%s: %s", p->get_name(), c->get_name(), b));
+                       }
+       }
 
-       for(const Tool *t: broken_tools)
-               for(const string &b: t->get_problems())
-                       problems.push_back(format("%s: %s", t->get_tag(), b));
+       problems.insert(problems.end(), make_move_iterator(target_problems.begin()), make_move_iterator(target_problems.end()));
 
        return problems;
 }
 
+void Builder::collect_broken_packages(const Package &pkg, vector<const Package *> &broken) const
+{
+       if(any_equals(broken, &pkg))
+               return;
+
+       broken.push_back(&pkg);
+
+       for(const Package *r: pkg.get_required_packages())
+               if(r->is_broken())
+                       collect_broken_packages(*r, broken);
+}
+
 void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all)
 {
        IO::BufferedFile in(fn.str());
@@ -351,6 +410,18 @@ Builder::LoadedPlugin::LoadedPlugin(LoadedPlugin &&other):
        other.plugin = 0;
 }
 
+Builder::LoadedPlugin &Builder::LoadedPlugin::operator=(LoadedPlugin &&other)
+{
+       delete plugin;
+       delete module;
+       path = move(other.path);
+       module = other.module;
+       plugin = other.plugin;
+       other.module = 0;
+       other.plugin = 0;
+       return *this;
+}
+
 Builder::LoadedPlugin::~LoadedPlugin()
 {
        delete plugin;