]> git.tdb.fi Git - builder.git/blobdiff - source/builder.cpp
Update deprecated things
[builder.git] / source / builder.cpp
index b06b8ffb2fd0b1de4c7b288989cd8704ce295919..6eeaa2fa3ca3b39e05298b3bd780ff5401cccbaa 100644 (file)
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <set>
-#include <sys/utsname.h>
-#include <msp/core/except.h>
-#include <msp/core/getopt.h>
+#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/except.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
-#include <msp/strings/formatter.h>
-#include <msp/strings/regex.h>
-#include <msp/strings/utils.h>
-#include <msp/time/units.h>
+#include <msp/strings/format.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
-#include "action.h"
-#include "analyzer.h"
+#include "androidtools.h"
 #include "binarypackage.h"
 #include "builder.h"
-#include "header.h"
-#include "install.h"
-#include "misc.h"
+#include "builtintools.h"
+#include "datatool.h"
+#include "installedfile.h"
 #include "package.h"
-#include "pkgconfig.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "systemlibrary.h"
-#include "unlink.h"
+#include "systemtools.h"
+#include "task.h"
 #include "virtualtarget.h"
 
 using namespace std;
 using namespace Msp;
 
-namespace {
-
-void update_hash(string &hash, const string &value)
+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(unsigned i=0; i<value.size(); ++i)
-               hash[i%hash.size()]^=value[i];
-}
-
-}
-
-
-Builder::Builder(int argc, char **argv):
-       main_pkg(0),
-       analyzer(0),
-       build(false),
-       clean(0),
-       dry_run(false),
-       help(false),
-       verbose(1),
-       show_progress(false),
-       build_file("Build"),
-       jobs(1),
-       conf_all(false),
-       conf_only(false),
-       build_all(false),
-       create_makefile(false)
-{
-       string analyze_mode;
-       string work_dir;
-       bool full_paths=false;
-       unsigned max_depth=5;
-       StringList cmdline_warn;
-       string prfx;
-       string arch;
-
-       GetOpt getopt;
-       getopt.add_option('a', "analyze",    analyze_mode,  GetOpt::REQUIRED_ARG).set_help("Perform analysis.  MODE can be deps, alldeps or rebuild.", "MODE");
-       getopt.add_option('b', "build",      build,         GetOpt::NO_ARG).set_help("Perform build even if doing analysis.");
-       getopt.add_option('c', "clean",      clean,         GetOpt::NO_ARG).set_help("Clean buildable targets.");
-       getopt.add_option('f', "file",       build_file,    GetOpt::REQUIRED_ARG).set_help("Read info from FILE instead of Build.", "FILE");
-       getopt.add_option('h', "help",       help,          GetOpt::NO_ARG).set_help("Print this message.");
-       getopt.add_option('j', "jobs",       jobs,          GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM");
-       getopt.add_option('n', "dry-run",    dry_run,       GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
-       getopt.add_option('v', "verbose",    verbose,       GetOpt::NO_ARG).set_help("Print more information about what's going on.");
-       getopt.add_option('A', "conf-all",   conf_all,      GetOpt::NO_ARG).set_help("Apply configuration to all packages.");
-       getopt.add_option('B', "build-all",  build_all,     GetOpt::NO_ARG).set_help("Build all targets unconditionally.");
-       getopt.add_option('C', "chdir",      work_dir,      GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR");
-       getopt.add_option('P', "progress",   show_progress, GetOpt::NO_ARG).set_help("Display progress while building.");
-       getopt.add_option('W', "what-if",    what_if,       GetOpt::REQUIRED_ARG).set_help("Pretend that FILE has changed.", "FILE");
-       getopt.add_option(     "arch",       arch,          GetOpt::REQUIRED_ARG).set_help("Architecture to build for.", "ARCH");
-       getopt.add_option(     "conf-only",  conf_only,     GetOpt::NO_ARG).set_help("Stop after configuring packages.");
-       getopt.add_option(     "full-paths", full_paths,    GetOpt::NO_ARG).set_help("Output full paths in analysis.");
-       getopt.add_option(     "max-depth",  max_depth,     GetOpt::REQUIRED_ARG).set_help("Maximum depth to show in analysis.", "NUM");
-       getopt.add_option(     "prefix",     prfx,          GetOpt::REQUIRED_ARG).set_help("Directory to install things to.", "DIR");
-       getopt.add_option(     "warnings",   cmdline_warn,  GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST");
-       usagemsg=getopt.generate_usage(argv[0])+" [<target> ...]";
-       helpmsg=getopt.generate_help();
-       getopt(argc, argv);
-
-       if(!analyze_mode.empty())
-       {
-               analyzer=new Analyzer(*this);
-
-               if(analyze_mode=="deps")
-                       analyzer->set_mode(Analyzer::DEPS);
-               else if(analyze_mode=="alldeps")
-                       analyzer->set_mode(Analyzer::ALLDEPS);
-               else if(analyze_mode=="rebuild")
-                       analyzer->set_mode(Analyzer::REBUILD);
-               else if(analyze_mode=="rdeps")
-                       analyzer->set_mode(Analyzer::RDEPS);
-               else
-                       throw UsageError("Invalid analyze mode");
-
-               analyzer->set_max_depth(max_depth);
-               analyzer->set_full_paths(full_paths);
-       }
-       else if(!clean && !create_makefile)
-               build=true;
-
-       const vector<string> &args=getopt.get_args();
-       for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
-       {
-               unsigned equal=i->find('=');
-               if(equal!=string::npos)
-                       cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1)));
-               else
-                       cmdline_targets.push_back(*i);
-       }
-
-       if(cmdline_targets.empty())
-               cmdline_targets.push_back("default");
-
-       if(!work_dir.empty())
-               FS::chdir(work_dir);
-
-       cwd=FS::getcwd();
-
-       utsname un;
-       string sysname="native";
-       if(uname(&un)==0)
-               sysname=tolower(un.sysname);
-
-       native_arch=&archs.insert(ArchMap::value_type(sysname, Architecture(*this, sysname, true))).first->second;
-       native_arch->set_tool("CC",  "gcc");
-       native_arch->set_tool("CXX", "g++");
-       native_arch->set_tool("LD",  "gcc");
-       native_arch->set_tool("LXX", "g++");
-       native_arch->set_tool("AR",  "ar");
-
-       load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
-       load_build_file((FS::get_home_dir()/".builderrc").str());
-
-       if(arch.empty())
-               current_arch=native_arch;
-       else
-               current_arch=&get_architecture(arch);
-
-       if(prfx.empty())
-       {
-               if(current_arch->is_native())
-                       prefix=(FS::get_home_dir()/"local").str();
-               else
-                       prefix=(FS::get_home_dir()/"local"/current_arch->get_name()).str();
-       }
-       else
-               prefix=FS::getcwd()/prfx;
-
-       warnings.push_back("all");
-       warnings.push_back("extra");
-       warnings.push_back("shadow");
-       warnings.push_back("pointer-arith");
-       warnings.push_back("error");
-       for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i)
-       {
-               vector<string> warns=split(*i, ',');
-               warnings.insert(warnings.end(), warns.begin(), warns.end());
-       }
-
-       pkg_path.push_back(cwd/".");
-       pkg_path.push_back(cwd/"..");
+       set_architecture(string());
 }
 
 Builder::~Builder()
 {
-       for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-               delete i->second;
-       for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-               delete i->second;
-       delete analyzer;
+       if(current_arch!=&native_arch)
+               delete current_arch;
 }
 
-int Builder::main()
+void Builder::set_architecture(const string &name)
 {
-       if(load_build_file(cwd/build_file))
+       if(name.empty())
        {
-               if(help)
-               {
-                       usage(0, "builder", false);
-                       return 0;
-               }
-               else
-               {
-                       IO::print(IO::cerr, "No build info here.\n");
-                       return 1;
-               }
+               current_arch = &native_arch;
+               prefix = FS::get_home_dir()/"local";
        }
-
-       main_pkg->configure(cmdline_options, conf_all?2:1);
-
-       if(help)
-       {
-               usage(0, "builder", false);
-               IO::print("\n");
-               package_help();
-               return 0;
-       }
-
-       if(!conf_only && create_targets())
-               return 1;
-
-       PackageList all_reqs=main_pkg->collect_requires();
-
-       if(conf_only)
-               return 0;
-
-       if(verbose>=2)
-               IO::print("Building on %s, for %s\n", native_arch->get_name(), current_arch->get_name());
-       if(verbose>=1)
-               IO::print("%d active packages, %d targets\n", all_reqs.size(), targets.size());
-       if(verbose>=2)
-       {
-               for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-               {
-                       IO::print(" %s", (*i)->get_name());
-                       if(dynamic_cast<SourcePackage *>(*i))
-                               IO::print("*");
-                       unsigned count=0;
-                       unsigned ood_count=0;
-                       for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
-                               if(j->second->get_package()==*i)
-                               {
-                                       ++count;
-                                       if(j->second->get_rebuild())
-                                               ++ood_count;
-                               }
-                       if(count)
-                       {
-                               IO::print(" (%d targets", count);
-                               if(ood_count)
-                                       IO::print(", %d out-of-date", ood_count);
-                               IO::print(")");
-                       }
-                       IO::print("\n");
-               }
-       }
-
-       if(analyzer)
-               analyzer->analyze();
-
-       if(!problems.empty())
-       {
-               IO::print(IO::cerr, "The following problems were detected:\n");
-               for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
-                       IO::print(IO::cerr, "  %s: %s\n", i->package, i->descr);
-               IO::print(IO::cerr, "Please fix them and try again.\n");
-               return 1;
-       }
-
-       //if(create_makefile
-
-       if(clean)
-               exit_code=do_clean();
-       else if(build)
-               exit_code=do_build();
-
-       return exit_code;
-}
-
-Package *Builder::get_package(const string &name)
-{
-       PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name()));
-       if(i==packages.end())
-               i=packages.find(name);
-       if(i!=packages.end())
-               return i->second;
-
-       FS::Path path=get_package_location(name);
-       if(!path.empty() && !load_build_file(path/"Build"))
-       {
-               i=packages.find(name);
-               if(i!=packages.end())
-                       return i->second;
-       }
-
-       // Package source not found - create a binary package
-       Package *pkg=BinaryPackage::from_pkgconfig(*this, name);
-
-       packages.insert(PackageMap::value_type(name, pkg));
-
-       if(!pkg)
-               problem(name, "not found");
-
-       return pkg;
-}
-
-Target *Builder::get_target(const string &n) const
-{
-       // XXX Used for getting targets by path.  get_target(const FS::Path &)?
-       TargetMap::const_iterator i=targets.find(n);
-       if(i!=targets.end())
-               return i->second;
-       return 0;
-}
-
-Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
-{
-       string hash(8, 0);
-       if(include[0]=='\"')
-               update_hash(hash, from.str());
-       for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-               update_hash(hash, *i);
-
-       string id=hash+include;
-       TargetMap::iterator i=includes.find(id);
-       if(i!=includes.end())
-               return i->second;
-
-       static string cxx_ver;
-       if(cxx_ver.empty())
-       {
-               StringList argv;
-               argv.push_back(current_arch->get_tool("CXX"));
-               argv.push_back("--version");
-               cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
-               while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
-               {
-                       unsigned dot=cxx_ver.rfind('.');
-                       if(dot==string::npos)
-                               break;
-                       cxx_ver.erase(dot);
-               }
-               if(verbose>=5)
-                       IO::print("C++ version is %s\n", cxx_ver);
-       }
-
-       string fn=include.substr(1);
-       if(verbose>=5)
-               IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
-
-       StringList syspath;
-       if(current_arch->is_native())
-               syspath.push_back("/usr/include");
        else
-               syspath.push_back("/usr/"+current_arch->get_prefix()+"/include");
-       syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
-
-       Target *tgt=0;
-       if(include[0]=='\"')
-               tgt=get_header(FS::Path(from)/fn);
-       for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-               tgt=get_header(cwd/ *j/fn);
-       for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-               tgt=get_header(FS::Path(*j)/fn);
-
-       includes.insert(TargetMap::value_type(id, tgt));
-
-       return tgt;
-}
-
-Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
-{
-       string hash(8, 0);
-       for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-               update_hash(hash, *i);
-
-       string id=hash+string(1, mode)+lib;
-       TargetMap::iterator i=libraries.find(id);
-       if(i!=libraries.end())
-               return i->second;
-
-       StringList syspath;
-       if(current_arch->is_native())
        {
-               syspath.push_back("/lib");
-               syspath.push_back("/usr/lib");
+               current_arch = new Architecture(*this, name);
+               prefix = FS::get_home_dir()/"local"/current_arch->get_name();
        }
-       else
-               syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
-
-       if(verbose>=5)
-               IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
-
-       Target *tgt=0;
-       for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-               tgt=get_library(lib, cwd/ *j, mode);
-       for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-               tgt=get_library(lib, *j, mode);
-
-       libraries.insert(TargetMap::value_type(id, tgt));
-
-       return tgt;
 }
 
-const Architecture &Builder::get_architecture(const string &arch) const
+void Builder::set_build_type(const string &name)
 {
-       ArchMap::const_iterator i=archs.find(arch);
-       if(i==archs.end())
-               throw KeyError("Unknown architecture", arch);
-
-       return i->second;
+       build_type = &get_item(build_types, name);
 }
 
-void Builder::apply_profile_template(Config &config, const string &pt) const
+void Builder::set_prefix(const FS::Path &p)
 {
-       vector<string> parts=split(pt, '-');
-
-       for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
-       {
-               ProfileTemplateMap::const_iterator j=profile_tmpl.find(*i);
-               if(j==profile_tmpl.end())
-                       continue;
-
-               config.update(j->second);
-       }
+       prefix = p;
 }
 
-void Builder::problem(const string &p, const string &d)
+void Builder::set_temp_directory(const FS::Path &p)
 {
-       problems.push_back(Problem(p, d));
+       tempdir = p;
 }
 
-void Builder::add_target(Target *t)
+void Builder::add_default_tools()
 {
-       targets.insert(TargetMap::value_type(t->get_name(), t));
-       new_tgts.push_back(t);
+       if(current_arch->get_system()=="android")
+               toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
+       toolchain.add_toolchain(new SystemTools(*this, *current_arch));
+       toolchain.add_toolchain(new BuiltinTools(*this));
+       toolchain.add_tool(new DataTool(*this));
 }
 
-void Builder::usage(const char *reason, const char *argv0, bool brief)
+void Builder::set_logger(const Logger *l)
 {
-       if(reason)
-               IO::print(IO::cerr, "%s\n", reason);
-
-       if(brief)
-               IO::print(IO::cerr, "Usage: %s\n", usagemsg);
-       else
-       {
-               IO::print(IO::cerr, "Usage: %s [options] [<target> ...]\n\n", argv0);
-               IO::print(IO::cerr, "Options:\n");
-               IO::print(IO::cerr, helpmsg);
-       }
+       logger = (l ? l : &default_logger);
 }
 
-FS::Path Builder::get_package_location(const string &name)
+list<string> Builder::collect_problems() const
 {
-       if(verbose>=3)
-               IO::print("Looking for package %s\n", name);
-
-       // Try to get source directory with pkgconfig
-       list<string> argv;
-       argv.push_back("pkg-config");
-       argv.push_back("--variable=source");
-       argv.push_back(name);
-       if(verbose>=4)
-               IO::print("Running %s\n", join(argv.begin(), argv.end()));
-       string srcdir=strip(run_command(argv));
-       if(!srcdir.empty())
-               return srcdir;
-
-       if(pkg_dirs.empty())
-       {
-               for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+       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())
                {
-                       list<string> files=list_files(*i);
-                       for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
-                       {
-                               FS::Path full=*i / *j;
-                               if(FS::exists(full/"Build"))
-                                       pkg_dirs.push_back(full);
-                       }
-               }
-               if(verbose>=3)
-                       IO::print("%d packages found in path\n", pkg_dirs.size());
-       }
-
-       bool msp=!name.compare(0, 3, "msp");
-       for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
-       {
-               string base=basename(*i);
-               unsigned dash=base.rfind('-');
+                       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));
 
-               if(!base.compare(0, dash, name))
-                       return *i;
-               else if(msp && !base.compare(0, dash-3, name, 3, string::npos))
-                       return *i;
-       }
-
-       return FS::Path();
-}
-
-int Builder::load_build_file(const FS::Path &fn)
-{
-       try
-       {
-               IO::BufferedFile in(fn.str());
-
-               if(verbose>=3)
-                       IO::print("Reading %s\n", fn);
+                       const Package *package = i->second->get_package();
+                       if(package && !package->get_problems().empty())
+                               broken_packages.insert(package);
 
-               DataFile::Parser parser(in, fn.str());
-               Loader loader(*this, fn.subpath(0, fn.size()-1));
-               loader.load(parser);
-       }
-       catch(const IO::FileNotFound &)
-       {
-               return -1;
-       }
-
-       return 0;
-}
+                       const Component *component = i->second->get_component();
+                       if(component && !component->get_problems().empty())
+                               broken_components.insert(component);
 
-int Builder::create_targets()
-{
-       Target *world=new VirtualTarget(*this, "world");
-
-       Target *def_tgt=new VirtualTarget(*this, "default");
-       world->add_depend(def_tgt);
-
-       Target *install=new VirtualTarget(*this, "install");
-       world->add_depend(install);
-
-       Target *tarballs=new VirtualTarget(*this, "tarballs");
-       world->add_depend(tarballs);
-
-       PackageList all_reqs=main_pkg->collect_requires();
-       for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-       {
-               SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
-               if(!spkg)
-                       continue;
-
-               const ComponentList &components=spkg->get_components();
-               for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
-                       j->create_targets();
-
-               if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
-               {
-                       PkgConfig *pc=new PkgConfig(*this, *spkg);
-                       install->add_depend(new Install(*this, *spkg, *pc));
+                       const Tool *tool = i->second->get_tool();
+                       if(tool && !tool->get_problems().empty())
+                               broken_tools.insert(tool);
                }
-       }
 
-       // Find dependencies until no new targets are created
-       while(!new_tgts.empty())
+       // TODO Sort components after their packages, and targets last
+       for(set<const Package *>::const_iterator i=broken_packages.begin(); i!=broken_packages.end(); ++i)
        {
-               Target *tgt=new_tgts.front();
-               new_tgts.erase(new_tgts.begin());
-               tgt->find_depends();
-               if(!tgt->get_depends_ready())
-                       new_tgts.push_back(tgt);
+               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));
        }
 
-       // Apply what-ifs
-       for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+       for(set<const Component *>::const_iterator i=broken_components.begin(); i!=broken_components.end(); ++i)
        {
-               Target *tgt=get_target((cwd/ *i).str());
-               if(!tgt)
-               {
-                       IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
-                       return -1;
-               }
-               tgt->touch();
+               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));
        }
 
-       // Make the cmdline target depend on all targets mentioned on the command line
-       Target *cmdline=new VirtualTarget(*this, "cmdline");
-       bool build_world=false;
-       for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
+       for(set<const Tool *>::const_iterator i=broken_tools.begin(); i!=broken_tools.end(); ++i)
        {
-               Target *tgt=get_target(*i);
-               if(!tgt)
-                       tgt=get_target((cwd/ *i).str());
-               if(!tgt)
-               {
-                       IO::print("I don't know anything about %s\n", *i);
-                       return -1;
-               }
-               if(tgt==world)
-                       build_world=true;
-               cmdline->add_depend(tgt);
-       }
-
-       /* If world is to be built, prepare cmdline.  If not, add cmdline to world
-       and prepare world.  I don't really like this, but it keeps the graph
-       acyclic.
-       
-       XXX Could we skip preparing targets we are not interested in? */
-       if(build_world)
-               cmdline->prepare();
-       else
-       {
-               world->add_depend(cmdline);
-               world->prepare();
+               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(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-               if(SourcePackage *spkg=dynamic_cast<SourcePackage *>(i->second))
-                       spkg->get_deps_cache().save();
-
-       return 0;
+       return problems;
 }
 
-Target *Builder::get_header(const Msp::FS::Path &fn)
+void Builder::load_build_file(const FS::Path &fn, const Config::InputOptions *opts, bool all)
 {
-       Target *tgt=get_target(fn.str());
-       if(tgt) return tgt;
+       IO::BufferedFile in(fn.str());
 
-       if(FS::is_reg(fn))
-       {
-               tgt=new SystemHeader(*this, fn.str());
-               return tgt;
-       }
-       return 0;
-}
+       get_logger().log("files", format("Reading %s", fn));
 
-Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
-{
-       // Populate a list of candidate filenames
-       StringList candidates;
-
-       if(mode!=ALL_STATIC)
-       {
-               if(current_arch->get_name()=="win32")
-               {
-                       candidates.push_back("lib"+lib+".dll");
-                       candidates.push_back(lib+".dll");
-               }
-               else
-                       candidates.push_back("lib"+lib+".so");
-       }
-
-       /* Static libraries are always considered, since sometimes shared versions
-       may not be available */
-       candidates.push_back("lib"+lib+".a");
-       if(current_arch->get_name()=="win32")
-               candidates.push_back("lib"+lib+".dll.a");
-
-       for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
-       {
-               string full=(path/ *i).str();
-               Target *tgt=get_target(full);
-
-               if(tgt)
-               {
-                       Target *real_tgt=tgt;
-                       if(Install *inst=dynamic_cast<Install *>(tgt))
-                               real_tgt=&inst->get_source();
-
-                       /* Ignore dynamic libraries from local packages unless library mode is
-                       DYNAMIC */
-                       if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
-                               continue;
-                       else if(tgt)
-                               return tgt;
-               }
-               else if(FS::is_reg(full))
-               {
-                       tgt=new SystemLibrary(*this, full);
-                       return tgt;
-               }
-       }
-
-       return 0;
+       DataFile::Parser parser(in, fn.str());
+       Loader loader(*this, opts, all);
+       loader.load(parser);
 }
 
-int Builder::do_build()
+int Builder::build(unsigned jobs, bool dry_run, bool show_progress)
 {
-       Target *cmdline=get_target("cmdline");
+       unsigned total = build_graph.count_rebuild_targets();
 
-       unsigned total=cmdline->count_rebuild();
        if(!total)
        {
-               IO::print("Already up to date\n");
+               get_logger().log("summary", "Already up to date");
                return 0;
        }
-       if(verbose>=1)
-               IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : ""));
+       get_logger().log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
 
-       vector<Action *> actions;
+       vector<Task *> tasks;
 
-       unsigned count=0;
+       unsigned count = 0;
 
-       bool fail=false;
-       bool finish=false;
+       bool fail = false;
+       bool finish = false;
+       bool starved = false;
 
        while(!finish)
        {
-               if(actions.size()<jobs && !fail)
+               if(tasks.size()<jobs && !fail && !starved)
                {
-                       Target *tgt=cmdline->get_buildable_target();
+                       Target *tgt = build_graph.get_buildable_target();
                        if(tgt)
                        {
-                               Action *action=tgt->build();
-                               if(action)
-                                       actions.push_back(action);
+                               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)
+                               {
+                                       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);
+                                       }
+                               }
 
                                if(show_progress)
                                        IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
                        }
-                       else if(actions.empty())
-                               finish=true;
+                       else if(tasks.empty())
+                               finish = true;
+                       else
+                               starved = true;
                }
                else
                        Time::sleep(10*Time::msec);
 
-               for(unsigned i=0; i<actions.size();)
+               for(unsigned i=0; i<tasks.size();)
                {
-                       int status=actions[i]->check();
-                       if(status>=0)
+                       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 actions[i];
-                               actions.erase(actions.begin()+i);
-                               if(status>0)
-                                       fail=true;
-                               if(actions.empty() && fail)
-                                       finish=true;
+                               delete tasks[i];
+                               tasks.erase(tasks.begin()+i);
+                               if(status==Task::ERROR)
+                                       fail = true;
+                               if(tasks.empty() && fail)
+                                       finish = true;
+                               starved = false;
                        }
                        else
                                ++i;
@@ -737,125 +235,105 @@ int Builder::do_build()
        if(show_progress)
                IO::print("\033[K");
        if(fail)
-               IO::print("Build failed\n");
+               get_logger().log("summary", "Build failed");
        else if(show_progress)
-               IO::print("Build complete\n");
+               get_logger().log("summary", "Build complete");
+
+       if(!dry_run)
+       {
+               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 fail;
 }
 
-int Builder::do_clean()
+int Builder::clean(bool all, bool dry_run)
 {
        // Cleaning doesn't care about ordering, so a simpler method can be used
 
        set<Target *> clean_tgts;
-       TargetList queue;
-       queue.push_back(get_target("cmdline"));
+       list<Target *> queue;
+       queue.push_back(&build_graph.get_goals());
 
        while(!queue.empty())
        {
-               Target *tgt=queue.front();
-               queue.erase(queue.begin());
+               Target *tgt = queue.front();
+               queue.pop_front();
 
-               if(tgt->get_buildable() && (tgt->get_package()==main_pkg || clean>=2))
+               if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all))
                        clean_tgts.insert(tgt);
 
-               const TargetList &deps=tgt->get_depends();
-               for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+               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)
-               if(FileTarget *ft=dynamic_cast<FileTarget *>(*i))
-               {
-                       Action *action=new Unlink(*this, *ft);
-                       while(action->check()<0) ;
-                       delete action;
-               }
-
-       return 0;
-}
-
-void Builder::package_help()
-{
-       const Config &config=main_pkg->get_config();
-       const Config::OptionMap &options=config.get_options();
-
-       IO::print("Required packages:\n  ");
-       const PackageList &requires=main_pkg->get_requires();
-       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-       {
-               if(i!=requires.begin())
-                       IO::print(", ");
-               IO::print((*i)->get_name());
-       }
-       IO::print("\n\nPackage configuration:\n");
-       for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
        {
-               const Config::Option &opt=i->second;
-               IO::print("  %s: %s (%s)", opt.name, opt.descr, opt.value);
-               if(opt.value!=opt.defv)
-                       IO::print(" [%s]", opt.defv);
-               IO::print("\n");
+               get_logger().log("tasks", format("RM    %s", (*i)->get_name()));
+               if(!dry_run)
+                       (*i)->clean();
        }
-}
 
-Application::RegApp<Builder> Builder::reg;
-string Builder::usagemsg;
-string Builder::helpmsg;
+       return 0;
+}
 
 
-Builder::Loader::Loader(Builder &b, const FS::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("profile", &Loader::profile);
+       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;
+}
+
+Builder::Loader::~Loader()
+{
+       if(obj.top_loader==this)
+               obj.top_loader = 0;
 }
 
 void Builder::Loader::architecture(const string &n)
 {
-       Architecture arch(bld, n);
-       load_sub(arch);
-       bld.archs.insert(ArchMap::value_type(n, arch));
+       if(obj.current_arch->match_name(n))
+               load_sub(*obj.current_arch);
 }
 
 void Builder::Loader::binpkg(const string &n)
 {
-       BinaryPackage *pkg=new BinaryPackage(bld, n);
+       BinaryPackage *pkg = new BinaryPackage(obj, n);
        load_sub(*pkg);
-       bld.packages.insert(PackageMap::value_type(n, pkg));
 }
 
-void Builder::Loader::profile(const string &n)
+void Builder::Loader::build_type(const string &n)
 {
-       StringMap prf;
-       ProfileLoader ldr(prf);
-       load_sub_with(ldr);
-       bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
+       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(bld, n, src);
-       if(!bld.main_pkg)
-               bld.main_pkg=pkg;
-
-       load_sub(*pkg);
-       bld.packages.insert(PackageMap::value_type(n, pkg));
-}
-
+       SourcePackage *pkg = new SourcePackage(obj, n, get_source());
 
-Builder::ProfileLoader::ProfileLoader(StringMap &p):
-       profile(p)
-{
-       add("option", &ProfileLoader::option);
-}
+       if(options)
+               load_sub(*pkg, *options);
+       else
+               load_sub(*pkg);
 
-void Builder::ProfileLoader::option(const string &o, const string &v)
-{
-       profile.insert(StringMap::value_type(o, v));
+       if(obj.build_type)
+               pkg->set_build_type(*obj.build_type);
 }