+#include <deque>
#include <set>
+#include <msp/core/algorithm.h>
+#include <msp/core/except.h>
#include <msp/core/maputils.h>
#include <msp/datafile/parser.h>
#include <msp/fs/dir.h>
Builder::Builder():
package_manager(*this),
native_arch(*this, string()),
- current_arch(0),
- build_type(0),
vfs(*this),
build_graph(*this),
- logger(&default_logger),
- tempdir("temp"),
- top_loader(0)
+ logger(&default_logger)
{
set_architecture(string());
}
void Builder::set_architecture(const string &name)
{
+ if(current_arch!=&native_arch)
+ delete current_arch;
+
if(name.empty())
- {
current_arch = &native_arch;
- prefix = FS::get_home_dir()/"local";
- }
else
- {
current_arch = new Architecture(*this, name);
- prefix = FS::get_home_dir()/"local"/current_arch->get_name();
- }
+
+ if(auto_prefix)
+ update_auto_prefix();
}
vector<string> Builder::get_build_types() const
{
vector<string> keys;
keys.reserve(build_types.size());
- for(BuildTypeMap::const_iterator i=build_types.begin(); i!=build_types.end(); ++i)
- keys.push_back(i->first);
+ for(const auto &kvp: build_types)
+ keys.push_back(kvp.first);
return keys;
}
+const BuildType &Builder::get_build_type() const
+{
+ if(!build_type)
+ throw invalid_state("no build type");
+ return *build_type;
+}
+
void Builder::set_build_type(const string &name)
{
build_type = &get_item(build_types, name);
void Builder::set_prefix(const FS::Path &p)
{
+ auto_prefix = false;
prefix = p;
}
tempdir = p;
}
+void Builder::update_auto_prefix()
+{
+ if(current_arch->is_native())
+ prefix = FS::get_home_dir()/"local";
+ else
+ prefix = FS::get_home_dir()/"local"/current_arch->get_name();
+}
+
void Builder::add_default_tools()
{
- const string &arch_tc = current_arch->get_toolchain();
+ toolchain.add_toolchain(new GnuTools(*this, *current_arch));
+ toolchain.add_toolchain(new ClangTools(*this, *current_arch));
if(current_arch->get_system()=="android")
toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
- else if(arch_tc=="msvc")
+ if(current_arch->get_system()=="windows")
toolchain.add_toolchain(new MicrosoftTools(*this, *current_arch));
- else if(arch_tc=="clang")
- toolchain.add_toolchain(new ClangTools(*this, *current_arch));
- else if(arch_tc=="gnu")
- toolchain.add_toolchain(new GnuTools(*this, *current_arch));
toolchain.add_toolchain(new BuiltinTools(*this));
toolchain.add_tool(new DataTool(*this));
+
+ auto i = find_if(toolchain.get_toolchains(), [](const Toolchain *tc){ return (tc->has_tool("CC") || tc->has_tool("CXX")); });
+ if(i!=toolchain.get_toolchains().end())
+ {
+ current_arch->refine((*i)->get_name());
+ if(auto_prefix)
+ update_auto_prefix();
+ }
}
void Builder::set_logger(const Logger *l)
logger = (l ? l : &default_logger);
}
-list<string> Builder::collect_problems() const
+vector<string> Builder::collect_problems() const
{
- list<string> problems;
+ vector<string> problems;
set<const Package *> broken_packages;
set<const Component *> broken_components;
set<const Tool *> broken_tools;
- const BuildGraph::TargetMap &targets = build_graph.get_targets();
- for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
- if(i->second->is_broken())
+ for(const auto &kvp: build_graph.get_targets())
+ if(kvp.second->is_broken())
{
- const list<string> &tgt_problems = i->second->get_problems();
- for(list<string>::const_iterator j=tgt_problems.begin(); j!=tgt_problems.end(); ++j)
- problems.push_back(format("%s: %s", i->second->get_name(), *j));
+ for(const string &p: kvp.second->get_problems())
+ problems.push_back(format("%s: %s", kvp.second->get_name(), p));
- const Package *package = i->second->get_package();
+ const Package *package = kvp.second->get_package();
if(package && !package->get_problems().empty())
broken_packages.insert(package);
- const Component *component = i->second->get_component();
+ const Component *component = kvp.second->get_component();
if(component && !component->get_problems().empty())
broken_components.insert(component);
- const Tool *tool = i->second->get_tool();
+ const Tool *tool = kvp.second->get_tool();
if(tool && !tool->get_problems().empty())
broken_tools.insert(tool);
}
// TODO Sort components after their packages, and targets last
- for(set<const Package *>::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i)
- {
- const list<string> &pkg_problems = (*i)->get_problems();
- for(list<string>::const_iterator j=pkg_problems.begin(); j!=pkg_problems.end(); ++j)
- problems.push_back(format("%s: %s", (*i)->get_name(), *j));
- }
+ for(const Package *p: broken_packages)
+ for(const string &b: p->get_problems())
+ problems.push_back(format("%s: %s", p->get_name(), b));
- for(set<const Component *>::const_iterator i=broken_components.begin(); i!=broken_components.end(); ++i)
- {
- const list<string> &comp_problems = (*i)->get_problems();
- for(list<string>::const_iterator j=comp_problems.begin(); j!=comp_problems.end(); ++j)
- problems.push_back(format("%s/%s: %s", (*i)->get_package().get_name(), (*i)->get_name(), *j));
- }
+ 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(set<const Tool *>::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i)
- {
- const list<string> &tool_problems = (*i)->get_problems();
- for(list<string>::const_iterator j=tool_problems.begin(); j!=tool_problems.end(); ++j)
- problems.push_back(format("%s: %s", (*i)->get_tag(), *j));
- }
+ for(const Tool *t: broken_tools)
+ for(const string &b: t->get_problems())
+ problems.push_back(format("%s: %s", t->get_tag(), b));
return problems;
}
{
IO::BufferedFile in(fn.str());
- get_logger().log("files", format("Reading %s", fn));
+ get_logger().log("files", "Reading %s", fn);
DataFile::Parser parser(in, fn.str());
Loader loader(*this, opts, all);
void Builder::save_caches()
{
- const PackageManager::PackageMap &packages = package_manager.get_packages();
- for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
- i->second->save_caches();
+ for(const auto &kvp: package_manager.get_packages())
+ kvp.second->save_caches();
}
int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
get_logger().log("summary", "Already up to date");
return 0;
}
- get_logger().log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
+ get_logger().log("summary", "Will build %d target%s", total, (total!=1 ? "s" : ""));
vector<Task *> tasks;
if(tgt)
{
if(tgt->get_tool())
- get_logger().log("tasks", format("%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name()));
+ {
+ if(show_progress)
+ IO::print("\033[K");
+ get_logger().log("tasks", "%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name());
+ }
Task *task = tgt->build();
if(task)
{
- get_logger().log("commands", format("%s", task->get_command()));
+ get_logger().log("commands", "%s", task->get_command());
if(dry_run)
{
task->signal_finished.emit(true);
// Cleaning doesn't care about ordering, so a simpler method can be used
set<Target *> clean_tgts;
- list<Target *> queue;
+ deque<Target *> queue;
queue.push_back(&build_graph.get_goals());
while(!queue.empty())
if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all))
clean_tgts.insert(tgt);
- const Target::Dependencies &deps = tgt->get_dependencies();
- for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
- if(!clean_tgts.count(*i))
- queue.push_back(*i);
+ for(Target *t: tgt->get_dependencies())
+ if(!clean_tgts.count(t))
+ queue.push_back(t);
}
- for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
+ for(Target *t: clean_tgts)
{
- get_logger().log("tasks", format("RM %s", (*i)->get_name()));
+ get_logger().log("tasks", "RM %s", t->get_name());
if(!dry_run)
- (*i)->clean();
+ t->clean();
}
return 0;
{
BuildType btype(n);
load_sub(btype);
- BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first;
+ auto i = obj.build_types.insert({ n, btype }).first;
if(!obj.build_type)
obj.build_type = &i->second;
}
{
SourcePackage *pkg = new SourcePackage(obj, n, get_source());
- if(options)
- load_sub(*pkg, *options);
- else
- load_sub(*pkg);
+ load_sub(*pkg, options);
if(obj.build_type)
pkg->set_build_type(*obj.build_type);
projects / builder.git / blobdiff