X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=f08b27aec69d667ac2eef6d1fdcfa09bf83292c5;hb=2a23a19ff6717b32ddc45f84681c5c969c967e45;hp=5a1d624390fa45250bab4451b3196693d5d46dc9;hpb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 5a1d624..032bb87 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,674 +1,349 @@
-#include <fstream>
-#include <iostream>
-#include <msp/progress.h>
-#include <msp/strconv.h>
-#include <msp/strutils.h>
-#include <msp/core/error.h>
-#include <msp/getopt++/getopt++.h>
-#include <msp/parser/parser.h>
-#include <msp/path/utils.h>
-#include <msp/time/units.h>
+#include <deque>
+#include <set>
+#include <msp/core/except.h>
+#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/timedelta.h>
 #include <msp/time/utils.h>
-#include "action.h"
-#include "analyzer.h"
+#include "androidtools.h"
+#include "binarypackage.h"
 #include "builder.h"
-#include "executable.h"
-#include "header.h"
-#include "install.h"
-#include "misc.h"
-#include "objectfile.h"
+#include "builtintools.h"
+#include "clangtools.h"
+#include "datatool.h"
+#include "gnutools.h"
+#include "installedfile.h"
+#include "microsofttools.h"
 #include "package.h"
 #include "sharedlibrary.h"
-#include "staticlibrary.h"
-#include "systemlibrary.h"
+#include "sourcepackage.h"
+#include "task.h"
 #include "virtualtarget.h"
 
 using namespace std;
 using namespace Msp;
 
-Builder::Builder(int argc, char **argv):
-	analyzer(0),
-	do_build(true),
-	verbose(1),
-	chrome(false),
-	build_file("Build"),
-	jobs(1)
+Builder::Builder():
+	package_manager(*this),
+	native_arch(*this, string()),
+	vfs(*this),
+	build_graph(*this),
+	logger(&default_logger)
 {
-	GetOpt getopt;
-	getopt.add_option(GetOpt::Option('a', "analyze", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option('b', "build", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('c', "clean", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build"));
-	getopt.add_option(GetOpt::Option('h', "help", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1"));
-	getopt.add_option(GetOpt::Option('n', "dry-run", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('v', "verbose", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('B', "build-all", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('C', "chdir", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option("max-depth", GetOpt::REQUIRED));
-	int index=getopt(argc, argv);
-
-	verbose+=getopt['v'].count();
-
-	if(getopt['a'])
-	{
-		analyzer=new Analyzer(*this);
-
-		string mode=getopt['a'].arg();
-		if(mode=="deps")
-			analyzer->set_mode(Analyzer::DEPS);
-		else if(mode=="alldeps")
-			analyzer->set_mode(Analyzer::ALLDEPS);
-		else if(mode=="rebuild")
-			analyzer->set_mode(Analyzer::REBUILD);
-		else if(mode=="rdeps")
-			analyzer->set_mode(Analyzer::RDEPS);
-		else
-			throw UsageError("Invalid analysis mode");
+	set_architecture(string());
+}
 
-		if(getopt["max-depth"])
-			analyzer->set_max_depth(strtol(getopt["max-depth"].arg()));
-		analyzer->set_full_paths(getopt["full-paths"]);
+Builder::~Builder()
+{
+	if(current_arch!=&native_arch)
+		delete current_arch;
+}
 
-		if(!getopt['b'])
-			do_build=false;
+void Builder::set_architecture(const string &name)
+{
+	if(name.empty())
+	{
+		current_arch = &native_arch;
+		prefix = FS::get_home_dir()/"local";
 	}
-
-	dry_run=getopt['n'];
-	jobs=max(strtol(getopt['j'].arg()), 1L);
-	chrome=getopt["chrome"];
-	conf_all=getopt['A'];
-	build_file=getopt['f'].arg();
-	build_all=getopt['B'];
-	help=getopt['h'];
-
-	if(getopt['C'])
-		chdir(getopt['C'].arg().c_str());
-
-	for(int i=index; i<argc; ++i)
+	else
 	{
-		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 = new Architecture(*this, name);
+		prefix = FS::get_home_dir()/"local"/current_arch->get_name();
 	}
-
-	if(cmdline_targets.empty())
-		cmdline_targets.push_back("default");
-
-	if(getopt['W'])
-		what_if.push_back(getopt['W'].arg());
-
-	cwd=Path::getcwd();
 }
 
-/**
-Gets a package with the specified name, possibly creating it.
-
-@param   n  Package name
-
-@return  Pointer to the package, or 0 if the package could not be located
-*/
-Package *Builder::get_package(const string &n)
+vector<string> Builder::get_build_types() const
 {
-	PackageMap::iterator i=packages.find(n);
-	if(i!=packages.end())
-		return i->second;
-
-	// Try to get source directory with pkgconfig
-	list<string> argv;
-	argv.push_back("pkg-config");
-	argv.push_back("--variable=source");
-	argv.push_back(n);
-	string srcdir=strip(run_command(argv));
-	
-	PathList dirs;
-	if(!srcdir.empty())
-		dirs.push_back(srcdir);
-
-	// Make some other guesses about the source directory
-	string dirname=n;
-	if(!dirname.compare(0, 3, "msp"))
-		dirname.erase(0, 3);
-	dirs.push_back(cwd/dirname);
-	dirs.push_back(cwd/".."/dirname);
-
-	// Go through the candidate directories and look for a Build file
-	for(PathList::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;
-			break;
-		}
-
-	// Package source not found - create a binary package
-	Package *pkg=Package::create(*this, n);
-	packages.insert(PackageMap::value_type(n, pkg));
-	if(pkg)
-		new_pkgs.push_back(pkg);
-
-	return pkg;
+	vector<string> keys;
+	keys.reserve(build_types.size());
+	for(const auto &kvp: build_types)
+		keys.push_back(kvp.first);
+	return keys;
 }
 
-/**
-Returns the target with the given name, or 0 if no such target exists.
-*/
-Target *Builder::get_target(const string &n)
+const BuildType &Builder::get_build_type() const
 {
-	TargetMap::iterator i=targets.find(n);
-	if(i!=targets.end())
-		return i->second;
-	return 0;
+	if(!build_type)
+		throw invalid_state("no build type");
+	return *build_type;
 }
 
-/**
-Tries to locate a header included from a given location and with a given include
-path.  Considers known targets as well as existing files.
-*/
-Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
+void Builder::set_build_type(const string &name)
 {
-	string hash(8, 0);
-	update_hash(hash, from);
-	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;
-
-	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;
-	//XXX Determine the C++ header location dynamically
-	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(cwd/ *j/fn)))
-			return tgt;
-	
-	return 0;
+	build_type = &get_item(build_types, name);
 }
 
-Target *Builder::get_library(const string &lib, const list<string> &path)
+void Builder::set_prefix(const FS::Path &p)
 {
-	string hash(8, 0);
-	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-		update_hash(hash, *i);
-
-	string id=hash+lib;
-	TargetMap::iterator i=libraries.find(id);
-	if(i!=libraries.end())
-		return i->second;
-
-	string basename="lib"+lib+".so";
-	for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
-	{
-		string full=(cwd/ *j/basename).str();
-		Target *tgt=get_target(full);
-		if(tgt) return tgt;
-		
-		if(Path::exists(full))
-		{
-			add_target(tgt=new SystemLibrary(*this, full));
-			return tgt;
-		}
-	}
-
-	return 0;
+	prefix = p;
 }
 
-int Builder::main()
+void Builder::set_temp_directory(const FS::Path &p)
 {
-	if(load_build_file(cwd/build_file))
-	{
-		cerr<<"No build info here.\n";
-		return 1;
-	}
-
-	default_pkg=packages.begin()->second;
-
-	while(!new_pkgs.empty())
-	{
-		Package *pkg=new_pkgs.front();
-		if(pkg==default_pkg || conf_all)
-			pkg->process_options(cmdline_options);
-		new_pkgs.erase(new_pkgs.begin());
-		pkg->resolve_refs();
-	}
-
-	if(help)
-	{
-		usage("builder", false);
-		cout<<'\n';
-		package_help();
-		return 0;
-	}
-
-	StringList missing;
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-		if(!i->second)
-			missing.push_back(i->first);
-
-	if(!missing.empty())
-	{
-		missing.sort();
-		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";
-		return 1;
-	}
-
-	default_pkg->create_build_info();
-
-	if(create_targets())
-		return 1;
-
-	cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
-	if(verbose>=2)
-	{
-		for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-		{
-			cout<<' '<<i->second->get_name();
-			if(i->second->get_buildable())
-				cout<<'*';
-			unsigned count=0;
-			unsigned ood_count=0;
-			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
-				if(j->second->get_package()==i->second)
-				{
-					++count;
-					if(j->second->get_rebuild())
-						++ood_count;
-				}
-			if(count)
-			{
-				cout<<" ("<<count<<" targets";
-				if(ood_count)
-					cout<<", "<<ood_count<<" out-of-date";
-				cout<<')';
-			}
-			cout<<'\n';
-		}
-	}
-
-	if(analyzer)
-		analyzer->analyze();
-
-	if(do_build)
-		build();
-
-	return exit_code;
-}
-
-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;
+	tempdir = p;
 }
 
-void Builder::usage(const char *argv0, bool brief)
+void Builder::add_default_tools()
 {
-	if(brief)
-		cerr<<"Usage: "<<argv0<<" [-a|--analyze MODE] [-b|--build] [-c|--clean] [-f|--file FILE] [-h|--help] [-j|--jobs NUM] [-n||--dry-run] [-v|--verbose] [-A|--conf-all] [-B|--build-all] [-C|--chdir DIRECTORY] [-W|--what-if FILE] [--chrome] [--full-paths] [--max-depth NUM] [<target> ...]";
-	else
-	{
-		cerr<<
-			"Usage: "<<argv0<<" [options] [<target> ...]\n"
-			"\n"
-			"Options:\n"
-			"  -a, --analyze MODE  Perform analysis.  MODE can be deps, alldeps or rebuild.\n"
-			"  -b, --build         Perform build even if doing analysis.\n"
-			"  -c, --clean         Clean buildable targets.\n"
-			"  -f, --file FILE     Read info from FILE instead of Build.\n"
-			"  -h, --help          Print this message.\n"
-			"  -j, --jobs NUM      Run NUM commands at once, whenever possible.\n"
-			"  -n, --dry-run       Don't actually do anything, only show what would be done.\n"
-			"  -v, --verbose       Print more information about what's going on.\n"
-			"  -A, --conf-all      Apply configuration to all packages.\n"
-			"  -B, --build-all     Build all targets unconditionally.\n"
-			"  -C, --chdir DIR     Change to DIR before doing anything else.\n"
-			"  -W, --what-if FILE  Pretend that FILE has changed.\n"
-			"  --chrome            Use extra chrome to print status.\n"
-			"  --full-paths        Output full paths in analysis.\n"
-			"  --max-depth NUM     Maximum depth to show in analysis.\n";
-	}
+	const string &arch_tc = current_arch->get_toolchain();
+	if(current_arch->get_system()=="android")
+		toolchain.add_toolchain(new AndroidTools(*this, *current_arch));
+	else if(arch_tc=="msvc")
+		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));
 }
 
-int Builder::load_build_file(const Path::Path &fn)
+void Builder::set_logger(const Logger *l)
 {
-	ifstream in(fn.str().c_str());
-	if(!in)
-		return -1;
-
-	Parser::Parser parser(in, fn.str());
-	Loader loader(*this, fn.subpath(0, fn.size()-1));
-	loader.load(parser);
-
-	return 0;
+	logger = (l ? l : &default_logger);
 }
 
-int Builder::create_targets()
+vector<string> Builder::collect_problems() const
 {
-	Target *world=new VirtualTarget(*this, "world");
-	add_target(world);
+	vector<string> problems;
+	set<const Package *> broken_packages;
+	set<const Component *> broken_components;
+	set<const Tool *> broken_tools;
 
-	Target *def_tgt=new VirtualTarget(*this, "default");
-	add_target(def_tgt);
-	world->add_depend(def_tgt);
-
-	Target *install=new VirtualTarget(*this, "install");
-	add_target(install);
-	world->add_depend(install);
-
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-	{
-		if(!i->second)
-			continue;
-		if(!i->second->get_buildable())
-			continue;
-
-		Path::Path inst_base;
-		if(i->second->get_config().is_option("prefix"))
-			inst_base=i->second->get_config().get_option("prefix").value;
-
-		const ComponentList &components=i->second->get_components();
-		for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
+	for(const auto &kvp: build_graph.get_targets())
+		if(kvp.second->is_broken())
 		{
-			PathList files;
-			const PathList &sources=j->get_sources();
-			for(PathList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
-			{
-				struct stat st;
-				stat(*k, st);
-				if(S_ISDIR(st.st_mode))
-				{
-					list<string> sfiles=list_files(*k);
-					for(list<string>::iterator l=sfiles.begin(); l!=sfiles.end(); ++l)
-						files.push_back(*k / *l);
-				}
-				else
-					files.push_back(*k);
-			}
+			for(const string &p: kvp.second->get_problems())
+				problems.push_back(format("%s: %s", kvp.second->get_name(), p));
 
-			bool build_exe=j->get_type()!=Component::HEADERS;
-			
-			list<ObjectFile *> objs;
-			for(PathList::iterator k=files.begin(); k!=files.end(); ++k)
-			{
-				string basename=(*k)[-1];
-				string ext=Path::splitext(basename).ext;
-				if(ext==".cpp" || ext==".c")
-				{
-					if(build_exe)
-					{
-						SourceFile *src=new SourceFile(*this, &*j, k->str());
-						add_target(src);
-						
-						ObjectFile *obj=new ObjectFile(*this, *j, *src);
-						add_target(obj);
-						objs.push_back(obj);
-					}
-				}
-				else if(ext==".h")
-				{
-					Target *hdr=get_target(k->str());
-					if(!hdr)
-					{
-						hdr=new Header(*this, &*j, k->str());
-						add_target(hdr);
-					}
-					if(!j->get_install_headers().empty())
-					{
-						Path::Path inst_path=inst_base/"include"/j->get_install_headers()/basename;
-						Install *inst=new Install(*this, *i->second, *hdr, inst_path.str());
-						add_target(inst);
-						install->add_depend(inst);
-					}
-				}
-			}
+			const Package *package = kvp.second->get_package();
+			if(package && !package->get_problems().empty())
+				broken_packages.insert(package);
 
-			if(build_exe)
-			{
-				Executable    *exe=0;
-				StaticLibrary *slib=0;
-				if(j->get_type()==Component::LIBRARY)
-				{
-					exe=new SharedLibrary(*this, *j, objs);
-					slib=new StaticLibrary(*this, *j, objs);
-					add_target(slib);
-				}
-				else
-					exe=new Executable(*this, *j, objs);
-				
-				add_target(exe);
-				if(i->second==default_pkg)
-				{
-					def_tgt->add_depend(exe);
-					if(slib) def_tgt->add_depend(slib);
-				}
-				else
-				{
-					world->add_depend(exe);
-					if(slib) world->add_depend(slib);
-				}
+			const Component *component = kvp.second->get_component();
+			if(component && !component->get_problems().empty())
+				broken_components.insert(component);
 
-				if(j->get_install())
-				{
-					string inst_dir;
-					if(j->get_type()==Component::PROGRAM)
-						inst_dir="bin";
-					else if(j->get_type()==Component::LIBRARY)
-						inst_dir="lib";
-					if(!inst_dir.empty())
-					{
-						Install *inst=new Install(*this, *i->second, *exe, (inst_base/inst_dir/Path::basename(exe->get_name())).str());
-						add_target(inst);
-						install->add_depend(inst);
-
-						if(slib)
-						{
-							inst=new Install(*this, *i->second, *slib, (inst_base/inst_dir/Path::basename(slib->get_name())).str());
-							add_target(inst);
-							install->add_depend(inst);
-						}
-					}
-				}
-			}
+			const Tool *tool = kvp.second->get_tool();
+			if(tool && !tool->get_problems().empty())
+				broken_tools.insert(tool);
 		}
-	}
-
-	while(!new_tgts.empty())
-	{
-		Target *tgt=new_tgts.front();
-		new_tgts.erase(new_tgts.begin());
-		tgt->find_depends();
-		if(!tgt->get_depends_ready())
-			new_tgts.push_back(tgt);
-	}
 
-	for(list<string>::iterator i=what_if.begin(); i!=what_if.end(); ++i)
-	{
-		Target *tgt=get_target((cwd/ *i).str());
-		if(!tgt)
-		{
-			cerr<<"Unknown what-if target "<<*i<<'\n';
-			return -1;
-		}
-		tgt->touch();
-	}
+	// 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));
 
-	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)
-		{
-			cerr<<"I don't know anything about "<<*i<<'\n';
-			return -1;
-		}
-		cmdline->add_depend(tgt);
-	}
+	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));
 
-	world->prepare();
+	for(const Tool *t: broken_tools)
+		for(const string &b: t->get_problems())
+			problems.push_back(format("%s: %s", t->get_tag(), b));
 
-	return 0;
+	return problems;
 }
 
-Target *Builder::check_header(const Msp::Path::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(Path::exists(fn))
-	{
-		add_target(tgt=new SystemHeader(*this, fn.str()));
-		return tgt;
-	}
-	return 0;
-}
+	get_logger().log("files", "Reading %s", fn);
 
-void Builder::add_target(Target *t)
-{
-	targets.insert(TargetMap::value_type(t->get_name(), t));
-	new_tgts.push_back(t);
+	DataFile::Parser parser(in, fn.str());
+	Loader loader(*this, opts, all);
+	loader.load(parser);
 }
 
-void Builder::update_hash(string &hash, const string &value)
+void Builder::save_caches()
 {
-	for(unsigned i=0; i<value.size(); ++i)
-		hash[i%hash.size()]^=value[i];
+	for(const auto &kvp: package_manager.get_packages())
+		kvp.second->save_caches();
 }
 
-/**
-This function supervises the build process, starting new actions when slots
-become available.
-*/
-int Builder::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)
 	{
-		cout<<"Already up to date\n";
+		get_logger().log("summary", "Already up to date");
 		return 0;
 	}
-	cout<<"Will build "<<total<<" target(s)\n";
+	get_logger().log("summary", "Will build %d target%s", total, (total!=1 ? "s" : ""));
 
-	vector<Action *> actions;
+	vector<Task *> tasks;
 
-	if(chrome)
-		cout<<"0 targets built\n";
-	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())
+				{
+					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", "%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;
-				if(chrome)
-				{
-					cout<<"\e["<<actions.size()+1<<'A';
-					cout<<count<<" targets built\n";
-					if(i)
-						cout<<"\e["<<i<<"B";
-					cout<<"\e[M";
-					if(i<actions.size()-1)
-						cout<<"\e["<<actions.size()-i-1<<"B";
-					cout.flush();
-				}
-				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;
 		}
 	}
 
-	return fail?-1:0;
+	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");
+
+	return fail;
 }
 
-void Builder::package_help()
+int Builder::clean(bool all, bool dry_run)
 {
-	const Config &config=default_pkg->get_config();
-	const Config::OptionMap &options=config.get_options();
+	// Cleaning doesn't care about ordering, so a simpler method can be used
 
-	cout<<"Required packages:\n  ";
-	const PkgRefList &requires=default_pkg->get_requires();
-	for(PkgRefList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+	set<Target *> clean_tgts;
+	deque<Target *> queue;
+	queue.push_back(&build_graph.get_goals());
+
+	while(!queue.empty())
 	{
-		if(i!=requires.begin())
-			cout<<", ";
-		cout<<i->get_name();
+		Target *tgt = queue.front();
+		queue.pop_front();
+
+		if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || all))
+			clean_tgts.insert(tgt);
+
+		for(Target *t: tgt->get_dependencies())
+			if(!clean_tgts.count(t))
+				queue.push_back(t);
 	}
-	cout<<"\n\n";
-	cout<<"Package configuration:\n";
-	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
+
+	for(Target *t: clean_tgts)
 	{
-		const Config::Option &opt=i->second;
-		cout<<"  "<<opt.name<<": "<<opt.descr<<" ("<<opt.value<<") ["<<opt.defv<<"]\n";
+		get_logger().log("tasks", "RM    %s", t->get_name());
+		if(!dry_run)
+			t->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)
+{
+	if(obj.current_arch->match_name(n))
+		load_sub(*obj.current_arch);
+}
+
+void Builder::Loader::binpkg(const string &n)
 {
-	Package *pkg=new Package(bld, n, src);
+	BinaryPackage *pkg = new BinaryPackage(obj, n);
 	load_sub(*pkg);
-	bld.packages.insert(PackageMap::value_type(n, pkg));
-	bld.new_pkgs.push_back(pkg);
 }
 
+void Builder::Loader::build_type(const string &n)
+{
+	BuildType btype(n);
+	load_sub(btype);
+	auto i = obj.build_types.insert({ 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());
+
+	load_sub(*pkg, options);
+
+	if(obj.build_type)
+		pkg->set_build_type(*obj.build_type);
+}