-#include <fstream>
-#include <msp/strutils.h>
-#include <msp/parser/parser.h>
-#include <msp/path/utils.h>
+#include <set>
+#include <msp/core/maputils.h>
+#include <msp/datafile/parser.h>
+#include <msp/fs/dir.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/time/units.h>
-#include "action.h"
+#include <msp/time/utils.h>
+#include "androidtools.h"
+#include "binarypackage.h"
#include "builder.h"
-#include "executable.h"
-#include "header.h"
-#include "misc.h"
-#include "objectfile.h"
+#include "builtintools.h"
+#include "clangtools.h"
+#include "datatool.h"
+#include "gnutools.h"
+#include "installedfile.h"
#include "package.h"
+#include "sharedlibrary.h"
+#include "sourcepackage.h"
+#include "task.h"
#include "virtualtarget.h"
using namespace std;
using namespace Msp;
-Builder::Builder(int argc, char **argv):
- verbose(1),
- cwd(Path::getcwd())
+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)
{
- for(int i=1; i<argc; ++i)
+ set_architecture(string());
+}
+
+Builder::~Builder()
+{
+ if(current_arch!=&native_arch)
+ delete current_arch;
+}
+
+void Builder::set_architecture(const string &name)
+{
+ if(name.empty())
{
- string v(argv[i]);
- unsigned equal=v.find('=');
- if(equal!=string::npos)
- cmdline_options.insert(RawOptionMap::value_type(v.substr(0, equal), v.substr(equal+1)));
- else
- cmdline_targets.push_back(argv[i]);
+ 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(cmdline_targets.empty())
- cmdline_targets.push_back("default");
+void Builder::set_build_type(const string &name)
+{
+ build_type = &get_item(build_types, name);
}
-Package *Builder::get_package(const string &n)
+void Builder::set_prefix(const FS::Path &p)
{
- PackageMap::iterator i=packages.find(n);
- if(i!=packages.end())
- return i->second;
-
- list<string> argv;
- argv.push_back("pkg-config");
- argv.push_back("--variable=source");
- argv.push_back(n);
- string srcdir=strip(run_command(argv));
-
- list<Path::Path> dirs;
- if(!srcdir.empty())
- dirs.push_back(srcdir);
-
- string dirname=n;
- if(dirname.compare(0, 3, "msp"))
- dirname.erase(0, 3);
- dirs.push_back(cwd/dirname);
- dirs.push_back(cwd/".."/dirname);
-
- for(list<Path::Path>::iterator j=dirs.begin(); j!=dirs.end(); ++j)
- if(!load_build_file(*j/"Build"))
- {
- i=packages.find(n);
- if(i!=packages.end())
- return i->second;
- return 0;
- }
-
- Package *pkg=Package::create(*this, n);
- packages.insert(PackageMap::value_type(n, pkg));
- new_pkgs.push_back(pkg);
+ prefix = p;
+}
- return pkg;
+void Builder::set_temp_directory(const FS::Path &p)
+{
+ tempdir = p;
}
-Target *Builder::get_target(const string &n)
+void Builder::add_default_tools()
{
- TargetMap::iterator i=targets.find(n);
- if(i!=targets.end())
- return i->second;
- return 0;
+ if(current_arch->get_system()=="darwin" && vfs.find_binary("clang"))
+ toolchain.add_toolchain(new ClangTools(*this, *current_arch));
+ if(current_arch->get_system()=="android")
+ toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
+ toolchain.add_toolchain(new GnuTools(*this, *current_arch));
+ toolchain.add_toolchain(new BuiltinTools(*this));
+ toolchain.add_tool(new DataTool(*this));
}
-Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
+void Builder::set_logger(const Logger *l)
{
- string id=from+":"+include;
- TargetMap::iterator i=includes.find(id);
- if(i!=includes.end())
- return i->second;
-
- string fn=include.substr(1);
- Target *tgt=0;
- if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn)))
- return tgt;
- if((tgt=check_header(Path::Path("/usr/include")/fn)))
- return tgt;
- if((tgt=check_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
- return tgt;
- for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
- if((tgt=check_header(Path::Path(*j)/fn)))
- return tgt;
-
- return 0;
+ logger = (l ? l : &default_logger);
}
-int Builder::main()
+list<string> Builder::collect_problems() const
{
- if(load_build_file("Build"))
- {
- cerr<<"No build info here.\n";
- return 1;
- }
+ list<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())
+ {
+ 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));
- default_pkg=packages.begin()->second;
+ const Package *package = i->second->get_package();
+ if(package && !package->get_problems().empty())
+ broken_packages.insert(package);
- while(!new_pkgs.empty())
- {
- Package *pkg=new_pkgs.front();
- if(pkg==default_pkg)
- pkg->process_options(cmdline_options);
- new_pkgs.erase(new_pkgs.begin());
- pkg->resolve_refs();
- }
+ const Component *component = i->second->get_component();
+ if(component && !component->get_problems().empty())
+ broken_components.insert(component);
+
+ const Tool *tool = i->second->get_tool();
+ if(tool && !tool->get_problems().empty())
+ broken_tools.insert(tool);
+ }
- std::list<std::string> missing;
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+ // 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<PackageRef> &requires=i->second->get_requires();
- for(list<PackageRef>::const_iterator j=requires.begin(); j!=requires.end(); ++j)
- if(!j->get_package())
- missing.push_back(j->get_name());
+ 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));
}
- if(!missing.empty())
+ for(set<const Component *>::const_iterator i=broken_components.begin(); i!=broken_components.end(); ++i)
{
- missing.sort();
- missing.unique();
- cerr<<"The following packages were not found on the system:\n";
- for(list<string>::iterator i=missing.begin(); i!=missing.end(); ++i)
- cerr<<" "<<*i<<'\n';
- cerr<<"Please install them and try again.\n";
+ 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));
}
- default_pkg->create_build_info();
-
- cout<<"Active packages:";
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+ for(set<const Tool *>::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i)
{
- cout<<' '<<i->second->get_name();
- if(i->second->get_buildable())
- cout<<'*';
+ 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));
}
- cout<<'\n';
-
- if(create_targets())
- return 1;
- /*for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
- cout<<i->second->get_name()<<' '<<i->second->get_type()<<' '<<i->second->get_rebuild()<<' '<<i->second->get_rebuild_reason()<<'\n';*/
+ return problems;
+}
- cout<<"Active targets: "<<targets.size()<<'\n';
+void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all)
+{
+ IO::BufferedFile in(fn.str());
- build();
+ get_logger().log("files", format("Reading %s", fn));
- return exit_code;
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, opts, all);
+ loader.load(parser);
}
-int Builder::load_build_file(const Path::Path &fn)
+int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
{
- ifstream in(fn.str().c_str());
- if(!in)
- return -1;
+ unsigned total = build_graph.count_rebuild_targets();
- Parser::Parser parser(in, fn.str());
- Loader loader(*this, cwd/fn.subpath(0, fn.size()-1));
- loader.load(parser);
+ if(!total)
+ {
+ get_logger().log("summary", "Already up to date");
+ return 0;
+ }
+ get_logger().log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
- return 0;
-}
+ vector<Task *> tasks;
-int Builder::create_targets()
-{
- Target *world=new VirtualTarget(*this, "world");
- add_target(world);
+ unsigned count = 0;
- Target *def_tgt=new VirtualTarget(*this, "default");
- add_target(def_tgt);
- world->add_depend(def_tgt);
+ bool fail = false;
+ bool finish = false;
+ bool starved = false;
- for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+ while(!finish)
{
- if(!i->second->get_buildable())
- continue;
-
- const ComponentList &components=i->second->get_components();
- for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
+ if(tasks.size()<jobs && !fail && !starved)
{
- Path::Path base=i->second->get_source()/j->get_source();
- list<string> files=list_files(base);
-
- list<ObjectFile *> objs;
- for(list<string>::iterator k=files.begin(); k!=files.end(); ++k)
+ Target *tgt = build_graph.get_buildable_target();
+ if(tgt)
{
- Path::Path fn=base/ *k;
- string ext=Path::splitext(*k).ext;
- if(ext==".cpp" || ext==".c")
+ if(tgt->get_tool())
+ get_logger().log("tasks", format("%-4s %s", tgt->get_tool()->get_tag(), tgt->get_name()));
+ Task *task = tgt->build();
+ if(task)
{
- SourceFile *src=new SourceFile(*this, &*j, fn.str());
- add_target(src);
-
- ObjectFile *obj=new ObjectFile(*this, *j, *src);
- add_target(obj);
- objs.push_back(obj);
+ get_logger().log("commands", format("%s", task->get_command()));
+ if(dry_run)
+ {
+ task->signal_finished.emit(true);
+ delete task;
+ }
+ else
+ {
+ task->start();
+ tasks.push_back(task);
+ }
}
- else if(ext==".h")
- add_target(new Header(*this, &*j, fn.str()));
- }
- Executable *exe=new Executable(*this, *j, objs);
- add_target(exe);
- if(i->second==default_pkg)
- def_tgt->add_depend(exe);
+ if(show_progress)
+ IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
+ }
+ else if(tasks.empty())
+ finish = true;
else
- world->add_depend(exe);
+ starved = true;
}
- }
-
- while(!new_tgts.empty())
- {
- Target *tgt=new_tgts.front();
- new_tgts.erase(new_tgts.begin());
- tgt->find_depends();
- }
+ else
+ Time::sleep(10*Time::msec);
- Target *cmdline=new VirtualTarget(*this, "cmdline");
- add_target(cmdline);
- world->add_depend(cmdline);
- for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
- {
- Target *tgt=get_target(*i);
- if(!tgt)
- tgt=get_target((cwd/ *i).str());
- if(!tgt)
+ for(unsigned i=0; i<tasks.size();)
{
- cerr<<"I don't know anything about "<<*i<<'\n';
- return 1;
+ Task::Status status;
+ if(jobs==1 || (tasks.size()==1 && starved))
+ status = tasks[i]->wait();
+ else
+ status = tasks[i]->check();
+
+ if(status!=Task::RUNNING)
+ {
+ ++count;
+
+ delete tasks[i];
+ tasks.erase(tasks.begin()+i);
+ if(status==Task::ERROR)
+ fail = true;
+ if(tasks.empty() && fail)
+ finish = true;
+ starved = false;
+ }
+ else
+ ++i;
}
- cmdline->add_depend(tgt);
}
- world->prepare();
-
- return 0;
-}
-
-Target *Builder::check_header(const Msp::Path::Path &fn)
-{
- Target *tgt=get_target(fn.str());
- if(tgt) return tgt;
+ if(show_progress)
+ IO::print("\033[K");
+ if(fail)
+ get_logger().log("summary", "Build failed");
+ else if(show_progress)
+ get_logger().log("summary", "Build complete");
- if(Path::exists(fn))
+ if(!dry_run)
{
- add_target(tgt=new SystemHeader(*this, fn.str()));
- return tgt;
+ const PackageManager::PackageMap &packages = package_manager.get_packages();
+ for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+ i->second->save_caches();
}
- return 0;
-}
-void Builder::add_target(Target *t)
-{
- targets.insert(TargetMap::value_type(t->get_name(), t));
- new_tgts.push_back(t);
+ return fail;
}
-int Builder::build()
+int Builder::clean(bool all, bool dry_run)
{
- Target *cmdline=get_target("cmdline");
- list<Action *> actions;
- bool fail=false;
+ // Cleaning doesn't care about ordering, so a simpler method can be used
- if(!cmdline->get_rebuild())
- cout<<"Already up to date\n";
+ set<Target *> clean_tgts;
+ list<Target *> queue;
+ queue.push_back(&build_graph.get_goals());
- while(cmdline->get_rebuild() && !fail)
+ while(!queue.empty())
{
- if(actions.empty() && !fail)
- {
- Target *tgt=cmdline->get_buildable_target();
- if(tgt)
- {
- //cout<<"Build "<<tgt->get_name()<<'\n';
- Action *action=tgt->build();
- if(action)
- actions.push_back(action);
- }
- }
- else
- sleep(10*Time::msec);
+ Target *tgt = queue.front();
+ queue.pop_front();
- for(list<Action *>::iterator i=actions.begin(); i!=actions.end();)
- {
- int status=(*i)->check();
- if(status>=0)
- {
- delete *i;
- i=actions.erase(i);
- if(status>0)
- fail=true;
- }
- else
- ++i;
- }
+ 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(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
+ {
+ get_logger().log("tasks", format("RM %s", (*i)->get_name()));
+ if(!dry_run)
+ (*i)->clean();
}
return 0;
}
-Application::RegApp<Builder> Builder::reg;
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
- bld(b),
- src(s)
+Builder::Loader::Loader(Builder &b, const Config::InputOptions *o, bool a):
+ DataFile::ObjectLoader<Builder>(b),
+ options(o),
+ conf_all(a)
{
+ add("architecture", &Loader::architecture);
+ add("binary_package", &Loader::binpkg);
+ add("build_type", &Loader::build_type);
add("package", &Loader::package);
+
+ if(!obj.top_loader)
+ obj.top_loader = this;
+ else if(!options && obj.top_loader!=this && obj.top_loader->conf_all)
+ options = obj.top_loader->options;
}
-void Builder::Loader::package(const string &n)
+Builder::Loader::~Loader()
+{
+ if(obj.top_loader==this)
+ obj.top_loader = 0;
+}
+
+void Builder::Loader::architecture(const string &n)
{
- Package *pkg=new Package(bld, n, src);
+ if(obj.current_arch->match_name(n))
+ load_sub(*obj.current_arch);
+}
+
+void Builder::Loader::binpkg(const string &n)
+{
+ BinaryPackage *pkg = new BinaryPackage(obj, n);
load_sub(*pkg);
- bld.packages.insert(PackageMap::value_type(n, pkg));
- bld.new_pkgs.push_back(pkg);
- //cout<<"loaded "<<pkg->get_name()<<'\n';
}
+void Builder::Loader::build_type(const string &n)
+{
+ BuildType btype(n);
+ load_sub(btype);
+ BuildTypeMap::iterator i = obj.build_types.insert(BuildTypeMap::value_type(n, btype)).first;
+ if(!obj.build_type)
+ obj.build_type = &i->second;
+}
+
+void Builder::Loader::package(const string &n)
+{
+ SourcePackage *pkg = new SourcePackage(obj, n, get_source());
+
+ if(options)
+ load_sub(*pkg, *options);
+ else
+ load_sub(*pkg);
+
+ if(obj.build_type)
+ pkg->set_build_type(*obj.build_type);
+}
projects / builder.git / blobdiff