#include <msp/core/maputils.h>
#include <msp/datafile/parser.h>
#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
#include <msp/io/buffered.h>
#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 "android/androidtools.h"
#include "binarypackage.h"
#include "builder.h"
-#include "builtin/builtintools.h"
-#include "datafile/datatool.h"
#include "installedfile.h"
#include "package.h"
#include "plugin.h"
#include "sharedlibrary.h"
-#include "sourcepackage.h"
#include "task.h"
+#include "tool.h"
#include "virtualtarget.h"
using namespace std;
using CreateFunc = Plugin *(Builder &);
FS::Path plugins_dir = FS::get_sys_lib_dir();
+ if(!FS::exists(plugins_dir))
+ return;
+
logger->log("files", "Traversing %s", plugins_dir);
+ vector<LoadedPlugin> unordered_plugins;
for(const string &f: list_filtered(plugins_dir, "\\.dlm$"))
{
LoadedPlugin plugin;
if(plugin.plugin)
{
logger->log("plugins", "Loaded plugin %s", f);
- plugins.emplace_back(move(plugin));
+ unordered_plugins.emplace_back(move(plugin));
continue;
}
else
{
logger->log("plugins", "Failed to initialize plugin %s: %s", f, exc.what());
}
+ }
+
+ add_plugins(unordered_plugins);
+}
+
+void Builder::add_plugins(vector<LoadedPlugin> &unordered_plugins)
+{
+ 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; });
+ };
- delete plugin.module;
+ 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;
+ }
+
+ 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()));
}
}
void Builder::add_default_tools()
{
- if(current_arch->get_system()=="android")
- toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
- toolchain.add_toolchain(new BuiltinTools(*this));
- toolchain.add_tool(new DataTool(*this));
for(const LoadedPlugin &p: plugins)
p.plugin->add_tools(toolchain, *current_arch);
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());
int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
{
unsigned total = build_graph.count_rebuild_targets();
+ Time::TimeStamp start_time = Time::now();
if(!total)
{
vector<Task *> tasks;
unsigned count = 0;
+ Time::TimeDelta sum_time;
bool fail = false;
bool finish = false;
{
++count;
+ const vector<const FileTarget *> &targets = tasks[i]->get_targets();
+ if(!targets.empty())
+ {
+ sum_time += tasks[i]->get_duration();
+ get_logger().log("timings", "%s built in %s", targets.front()->get_name(), tasks[i]->get_duration());
+ }
+
delete tasks[i];
tasks.erase(tasks.begin()+i);
if(status==Task::ERROR)
else if(show_progress)
get_logger().log("summary", "Build complete");
+ Time::TimeStamp end_time = Time::now();
+ get_logger().log("timings", "Build took %s, with a total %s spent on tasks", end_time-start_time, sum_time);
+
return fail;
}
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;