#include <deque>
#include <set>
+#include <msp/core/algorithm.h>
#include <msp/core/except.h>
#include <msp/core/maputils.h>
#include <msp/datafile/parser.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;
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());
}
void Builder::set_logger(const Logger *l)
{
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);
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);
for(Target *t: clean_tgts)
{
- get_logger().log("tasks", format("RM %s", t->get_name()));
+ get_logger().log("tasks", "RM %s", t->get_name());
if(!dry_run)
t->clean();
}