X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=6794842c50d2c872e8ac36e560d2d2dc58fd624c;hb=4ba3ef9601166127d0782b3e6a3352b71db7ccc9;hp=c900837a2d6e978079294606ccbf4f182ae520e8;hpb=97001ddfa2463e6a3526eff772962acdad45f995;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index c900837..6794842 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,333 +1,657 @@
-#include <fstream>
-#include <msp/strutils.h>
-#include <msp/parser/parser.h>
-#include <msp/path/utils.h>
+#include <set>
+#include <msp/core/getopt.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/file.h>
+#include <msp/io/print.h>
+#include <msp/strings/format.h>
+#include <msp/strings/regex.h>
+#include <msp/strings/utils.h>
 #include <msp/time/units.h>
-#include "action.h"
+#include <msp/time/utils.h>
+#include "analyzer.h"
+#include "binarypackage.h"
 #include "builder.h"
-#include "executable.h"
-#include "header.h"
-#include "misc.h"
-#include "objectfile.h"
+#include "copy.h"
+#include "gnuarchiver.h"
+#include "gnuccompiler.h"
+#include "gnucxxcompiler.h"
+#include "gnulinker.h"
+#include "installedfile.h"
+#include "mingwdlltool.h"
 #include "package.h"
+#include "pkgconfiggenerator.h"
+#include "sharedlibrary.h"
+#include "sourcepackage.h"
+#include "tar.h"
+#include "task.h"
 #include "virtualtarget.h"
 
 using namespace std;
 using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
-	verbose(1),
-	cwd(Path::getcwd())
+	package_manager(*this),
+	main_pkg(0),
+	native_arch(*this, string()),
+	build_type(0),
+	vfs(*this),
+	analyzer(0),
+	build(false),
+	clean(0),
+	dry_run(false),
+	help(false),
+	show_progress(false),
+	build_file("Build"),
+	jobs(1),
+	conf_all(false),
+	conf_only(false),
+	build_all(false),
+	create_makefile(false),
+	tempdir("temp")
 {
-	for(int i=1; i<argc; ++i)
+	string analyze_mode;
+	string work_dir;
+	bool full_paths = false;
+	unsigned max_depth = 4;
+	string prfx;
+	string temp_str;
+	string arch;
+	bool no_externals = false;
+	unsigned verbose = 1;
+	bool silent = false;
+	list<string> log_channels;
+	string build_type_name;
+
+	GetOpt getopt;
+	getopt.add_option('a', "analyze",    analyze_mode,  GetOpt::REQUIRED_ARG).set_help("Perform dependency analysis.", "MODE");
+	getopt.add_option('b', "build",      build,         GetOpt::NO_ARG).set_help("Perform build even if also doing something else.");
+	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 build instructions from FILE.", "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 up to NUM tasks in parallel.", "NUM");
+	getopt.add_option('l', "log",        log_channels,  GetOpt::REQUIRED_ARG).set_help("Enable listed log channels.", "LIST");
+	getopt.add_option('n', "dry-run",    dry_run,       GetOpt::NO_ARG).set_help("Show what would be done without actually doing it.");
+	getopt.add_option('s', "silent",     silent,        GetOpt::NO_ARG).set_help("Don't print any messages other than errors.");
+	getopt.add_option('t', "build-type", build_type_name, GetOpt::REQUIRED_ARG).set_help("Set build type.", "TYPE");
+	getopt.add_option('v', "verbose",    verbose,       GetOpt::NO_ARG).set_help("Print more information about what's going on.");
+	getopt.add_option('x', "no-externals",  no_externals, GetOpt::NO_ARG).set_help("Do not load external source packages.");
+	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("Build for architecture ARCH.", "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("Show up to NUM levels in analysis.", "NUM");
+	getopt.add_option(     "prefix",     prfx,          GetOpt::REQUIRED_ARG).set_help("Install things to DIR.", "DIR");
+	getopt.add_option(     "tempdir",    temp_str,      GetOpt::REQUIRED_ARG).set_help("Store temporary files in DIR.", "DIR");
+	usagemsg = getopt.generate_usage(argv[0])+" [<target> ...]";
+	helpmsg = getopt.generate_help();
+	getopt(argc, argv);
+
+	if(silent)
+		--verbose;
+	if(verbose>=1)
 	{
-		string v(argv[i]);
-		unsigned equal=v.find('=');
+		logger.enable_channel("summary");
+		logger.enable_channel("tasks");
+	}
+	if(verbose>=2)
+	{
+		logger.enable_channel("environment");
+		logger.enable_channel("packages");
+		logger.enable_channel("commands");
+	}
+	if(verbose>=3)
+	{
+		logger.enable_channel("files");
+		logger.enable_channel("auxcommands");
+	}
+	for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
+	{
+		vector<string> parts = split(*i, ',');
+		for(vector<string>::const_iterator j=parts.begin(); j!=parts.end(); ++j)
+			logger.enable_channel(*j);
+	}
+
+	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 usage_error("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)
+	{
+		string::size_type equal = i->find('=');
 		if(equal!=string::npos)
-			cmdline_options.insert(RawOptionMap::value_type(v.substr(0, equal), v.substr(equal+1)));
+			cmdline_options.insert(Config::InputOptions::value_type(i->substr(0, equal), i->substr(equal+1)));
 		else
-			cmdline_targets.push_back(argv[i]);
+			cmdline_targets.push_back(*i);
 	}
 
 	if(cmdline_targets.empty())
 		cmdline_targets.push_back("default");
-}
 
-Package *Builder::get_package(const string &n)
-{
-	PackageMap::iterator i=packages.find(n);
-	if(i!=packages.end())
-		return i->second;
+	if(!work_dir.empty())
+		FS::chdir(work_dir);
 
-	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);
+	cwd = FS::getcwd();
 
-	return pkg;
-}
+	package_manager.append_package_path(cwd);
+	package_manager.append_package_path(cwd/"..");
+	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder"));
 
-Target *Builder::get_target(const string &n)
-{
-	TargetMap::iterator i=targets.find(n);
-	if(i!=targets.end())
-		return i->second;
-	return 0;
+	package_manager.set_no_externals(no_externals);
+
+	if(arch.empty())
+		current_arch = &native_arch;
+	else
+		current_arch = new Architecture(*this, arch);
+
+	list<FS::Path> start_files;
+	start_files.push_back(FS::get_sys_data_dir(argv[0], "builder")/"builderrc");
+	start_files.push_back(FS::get_user_data_dir("builder")/"rc");
+	for(list<FS::Path>::const_iterator i=start_files.begin(); i!=start_files.end(); ++i)
+		if(FS::exists(*i))
+			load_build_file(*i);
+
+	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 = cwd/prfx;
+
+	if(!temp_str.empty())
+		tempdir = temp_str;
+
+	if(!build_type_name.empty())
+	{
+		BuildTypeMap::iterator i = build_types.find(build_type_name);
+		if(i==build_types.end())
+			throw usage_error("Unknown build type");
+		build_type = &i->second;
+	}
+
+	toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
+	toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
+	toolchain.add_tool(new GnuLinker(*this, *current_arch));
+	toolchain.add_tool(new GnuArchiver(*this, *current_arch));
+	toolchain.add_tool(new Copy(*this));
+	toolchain.add_tool(new Tar(*this));
+	toolchain.add_tool(new PkgConfigGenerator(*this));
+	if(current_arch->get_system()=="windows")
+		toolchain.add_tool(new MingwDllTool(*this, *current_arch));
 }
 
-Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
+Builder::~Builder()
 {
-	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;
+	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+		delete i->second;
+	delete analyzer;
 }
 
 int Builder::main()
 {
-	if(load_build_file("Build"))
+	FS::Path main_file = cwd/build_file;
+	if(!FS::exists(main_file))
 	{
-		cerr<<"No build info here.\n";
-		return 1;
+		if(help)
+		{
+			usage(0, "builder", false);
+			return 0;
+		}
+		else
+		{
+			IO::print(IO::cerr, "The file %s does not exist.\n", main_file);
+			return 1;
+		}
 	}
 
-	default_pkg=packages.begin()->second;
+	load_build_file(main_file);
 
-	while(!new_pkgs.empty())
+	if(help)
 	{
-		Package *pkg=new_pkgs.front();
-		if(pkg==default_pkg)
-			pkg->process_options(cmdline_options);
-		new_pkgs.erase(new_pkgs.begin());
-		pkg->resolve_refs();
+		usage(0, "builder", false);
+		IO::print("\n");
+		package_help();
+		return 0;
 	}
 
-	std::list<std::string> missing;
-	for(PackageMap::iterator i=packages.begin(); i!=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());
-	}
+	if(!prepare_build())
+		return 1;
 
-	if(!missing.empty())
+	if(conf_only)
+		return 0;
+
+	logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
+		current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
+	logger.log("environment", format("Prefix is %s", prefix));
+	if(tempdir.is_absolute())
+		logger.log("environment", format("Temporary directory is %s", tempdir));
+	else
+		logger.log("environment", format("Using per-package temporary directory %s", tempdir));
+	if(build_type)
+		logger.log("environment", format("Build type is %s", build_type->get_name()));
+
+	const PackageManager::PackageMap &packages = package_manager.get_packages();
+	list<string> package_details;
+	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.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";
+		if(!i->second->is_prepared())
+			continue;
+
+		string line = i->second->get_name();
+		if(dynamic_cast<SourcePackage *>(i->second))
+		{
+			line += '*';
+
+			unsigned count = 0;
+			unsigned to_be_built = 0;
+			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+				if(j->second->get_package()==i->second)
+				{
+					++count;
+					if(j->second->needs_rebuild())
+						++to_be_built;
+				}
+			if(count)
+			{
+				line += format(" (%d targets", count);
+				if(to_be_built)
+					line += format(", %d to be built", to_be_built);
+				line += ')';
+			}
+		}
+
+		package_details.push_back(line);
 	}
 
-	default_pkg->create_build_info();
+	logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size()));
+	for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
+		logger.log("packages", *i);
+
+	if(analyzer)
+		analyzer->analyze();
 
-	cout<<"Active packages:";
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+	if(!problems.empty())
 	{
-		cout<<' '<<i->second->get_name();
-		if(i->second->get_buildable())
-			cout<<'*';
-	}
-	cout<<'\n';
-	
-	if(create_targets())
+		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);
+		if(!analyzer)
+			IO::print(IO::cerr, "Please fix them and try again.\n");
 		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';*/
+	if(clean)
+		exit_code = do_clean();
+	if(build)
+		exit_code = do_build();
 
-	cout<<"Active targets: "<<targets.size()<<'\n';
+	return exit_code;
+}
 
-	build();
+Target *Builder::get_target(const string &n) const
+{
+	TargetMap::const_iterator i = targets.find(n);
+	if(i!=targets.end())
+		return i->second;
+	return 0;
+}
 
-	return exit_code;
+void Builder::problem(const string &p, const string &d)
+{
+	problems.push_back(Problem(p, d));
 }
 
-int Builder::load_build_file(const Path::Path &fn)
+void Builder::add_target(Target *t)
 {
-	ifstream in(fn.str().c_str());
-	if(!in)
-		return -1;
+	targets.insert(TargetMap::value_type(t->get_name(), t));
+}
 
-	Parser::Parser parser(in, fn.str());
-	Loader loader(*this, cwd/fn.subpath(0, fn.size()-1));
-	loader.load(parser);
+void Builder::add_primary_target(Target &t)
+{
+	get_target("world")->add_dependency(t);
 
-	return 0;
+	if(t.get_package()==main_pkg && t.get_component() && t.get_component()->is_default())
+		get_target("default")->add_dependency(t);
 }
 
-int Builder::create_targets()
+void Builder::add_installed_target(Target &t)
 {
-	Target *world=new VirtualTarget(*this, "world");
-	add_target(world);
+	Target *inst_tgt = 0;
+	if(const Tool *tool = t.get_tool())
+		inst_tgt = tool->create_install(t);
+	if(!inst_tgt)
+		inst_tgt = toolchain.get_tool("CP").create_target(t);
+	get_target("install")->add_dependency(*inst_tgt);
+}
 
-	Target *def_tgt=new VirtualTarget(*this, "default");
-	add_target(def_tgt);
-	world->add_depend(def_tgt);
+void Builder::usage(const char *reason, const char *argv0, bool brief)
+{
+	if(reason)
+		IO::print(IO::cerr, "%s\n", reason);
 
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+	if(brief)
+		IO::print(IO::cerr, "Usage: %s\n", usagemsg);
+	else
 	{
-		if(!i->second->get_buildable())
-			continue;
+		IO::print(IO::cerr, "Builder 1.0\n\n");
+		IO::print(IO::cerr, "Usage: %s [options] [<target> ...]\n\n", argv0);
+		IO::print(IO::cerr, "Options:\n");
+		IO::print(IO::cerr, helpmsg);
+	}
+}
 
-		const ComponentList &components=i->second->get_components();
-		for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
-		{
-			Path::Path base=i->second->get_source()/j->get_source();
-			list<string> files=list_files(base);
+void Builder::load_build_file(const FS::Path &fn)
+{
+	IO::BufferedFile in(fn.str());
 
-			list<ObjectFile *> objs;
-			for(list<string>::iterator k=files.begin(); k!=files.end(); ++k)
-			{
-				Path::Path fn=base/ *k;
-				string ext=Path::splitext(*k).ext;
-				if(ext==".cpp" || ext==".c")
-				{
-					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);
-				}
-				else if(ext==".h")
-					add_target(new Header(*this, &*j, fn.str()));
-			}
+	logger.log("files", format("Reading %s", fn));
 
-			Executable *exe=new Executable(*this, *j, objs);
-			add_target(exe);
-			if(i->second==default_pkg)
-				def_tgt->add_depend(exe);
-			else
-				world->add_depend(exe);
-		}
-	}
+	DataFile::Parser parser(in, fn.str());
+	Loader loader(*this);
+	loader.load(parser);
+}
+
+bool Builder::prepare_build()
+{
+	Target *world = new VirtualTarget(*this, "world");
 
-	while(!new_tgts.empty())
+	Target *def_tgt = new VirtualTarget(*this, "default");
+	world->add_dependency(*def_tgt);
+
+	Target *install = new VirtualTarget(*this, "install");
+	world->add_dependency(*install);
+
+	Target *tarballs = new VirtualTarget(*this, "tarballs");
+	world->add_dependency(*tarballs);
+
+	main_pkg->prepare();
+
+	// Make the cmdline target depend on all targets mentioned on the command line
+	Target *cmdline = new VirtualTarget(*this, "cmdline");
+	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
 	{
-		Target *tgt=new_tgts.front();
-		new_tgts.erase(new_tgts.begin());
-		tgt->find_depends();
+		Target *tgt = get_target(*i);
+		if(!tgt)
+			tgt = vfs.get_target(*i);
+		if(!tgt)
+			tgt = vfs.get_target(cwd/ *i);
+		if(!tgt)
+		{
+			IO::print("I don't know anything about %s\n", *i);
+			return false;
+		}
+
+		cmdline->add_dependency(*tgt);
 	}
 
-	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)
+	cmdline->prepare();
+
+	// Apply what-ifs
+	for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
 	{
-		Target *tgt=get_target(*i);
-		if(!tgt)
-			tgt=get_target((cwd/ *i).str());
+		FileTarget *tgt = vfs.get_target(cwd/ *i);
 		if(!tgt)
 		{
-			cerr<<"I don't know anything about "<<*i<<'\n';
-			return 1;
+			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
+			return false;
 		}
-		cmdline->add_depend(tgt);
+		tgt->touch();
 	}
 
-	world->prepare();
+	if(build_all)
+	{
+		for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+			if(i->second->is_buildable() && !i->second->needs_rebuild())
+				i->second->force_rebuild();
+	}
 
-	return 0;
+	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 true;
 }
 
-Target *Builder::check_header(const Msp::Path::Path &fn)
+int Builder::do_build()
 {
-	Target *tgt=get_target(fn.str());
-	if(tgt) return tgt;
+	Target *cmdline = get_target("cmdline");
+
+	unsigned total = 0;
+	for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
+		if(i->second->is_buildable() && i->second->needs_rebuild())
+			++total;
 
-	if(Path::exists(fn))
+	if(!total)
 	{
-		add_target(tgt=new SystemHeader(*this, fn.str()));
-		return tgt;
+		logger.log("summary", "Already up to date");
+		return 0;
 	}
-	return 0;
-}
+	logger.log("summary", format("Will build %d target%s", total, (total!=1 ? "s" : "")));
 
-void Builder::add_target(Target *t)
-{
-	targets.insert(TargetMap::value_type(t->get_name(), t));
-	new_tgts.push_back(t);
-}
+	vector<Task *> tasks;
 
-int Builder::build()
-{
-	Target *cmdline=get_target("cmdline");
-	list<Action *> actions;
-	bool fail=false;
+	unsigned count = 0;
 
-	if(!cmdline->get_rebuild())
-		cout<<"Already up to date\n";
+	bool fail = false;
+	bool finish = false;
+	bool starved = false;
 
-	while(cmdline->get_rebuild() && !fail)
+	while(!finish)
 	{
-		if(actions.empty() && !fail)
+		if(tasks.size()<jobs && !fail && !starved)
 		{
-			Target *tgt=cmdline->get_buildable_target();
+			Target *tgt = cmdline->get_buildable_target();
 			if(tgt)
 			{
-				//cout<<"Build "<<tgt->get_name()<<'\n';
-				Action *action=tgt->build();
-				if(action)
-					actions.push_back(action);
+				if(tgt->get_tool())
+					logger.log("tasks", format("%-4s  %s", tgt->get_tool()->get_tag(), tgt->get_name()));
+				Task *task = tgt->build();
+				if(task)
+				{
+					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(tasks.empty())
+				finish = true;
+			else
+				starved = true;
 		}
 		else
-			sleep(10*Time::msec);
+			Time::sleep(10*Time::msec);
 
-		for(list<Action *>::iterator i=actions.begin(); i!=actions.end();)
+		for(unsigned i=0; i<tasks.size();)
 		{
-			int status=(*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)
 			{
-				delete *i;
-				i=actions.erase(i);
-				if(status>0)
-					fail=true;
+				++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;
 		}
 	}
 
+	if(show_progress)
+		IO::print("\033[K");
+	if(fail)
+		logger.log("summary", "Build failed");
+	else if(show_progress)
+		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()
+{
+	// Cleaning doesn't care about ordering, so a simpler method can be used
+
+	set<Target *> clean_tgts;
+	list<Target *> queue;
+	queue.push_back(get_target("cmdline"));
+
+	while(!queue.empty())
+	{
+		Target *tgt = queue.front();
+		queue.erase(queue.begin());
+
+		if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
+			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)
+	{
+		logger.log("tasks", format("RM    %s", (*i)->get_name()));
+		if(!dry_run)
+			(*i)->clean();
+	}
+
 	return 0;
 }
 
-Application::RegApp<Builder> Builder::reg;
+void Builder::package_help()
+{
+	const Config &config = main_pkg->get_config();
+	const Config::OptionMap &options = config.get_options();
+
+	IO::print("Required packages:\n  ");
+	const Package::Requirements &requires = main_pkg->get_required_packages();
+	for(Package::Requirements::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.description, opt.value);
+		if(opt.value!=opt.default_value)
+			IO::print(" [%s]", opt.default_value);
+		IO::print("\n");
+	}
+}
+
+string Builder::usagemsg;
+string Builder::helpmsg;
+
 
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
-	bld(b),
-	src(s)
+Builder::Loader::Loader(Builder &b):
+	DataFile::ObjectLoader<Builder>(b)
 {
+	add("architecture", &Loader::architecture);
+	add("binary_package", &Loader::binpkg);
+	add("build_type", &Loader::build_type);
+	add("profile", &Loader::profile);
 	add("package", &Loader::package);
 }
 
-void Builder::Loader::package(const string &n)
+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::profile(const string &)
+{
+	IO::print("Profiles are deprecated\n");
+}
+
+void Builder::Loader::package(const string &n)
+{
+	SourcePackage *pkg = new SourcePackage(obj, n, get_source());
+	if(!obj.main_pkg)
+		obj.main_pkg = pkg;
+
+	if(obj.conf_all || pkg==obj.main_pkg)
+		load_sub(*pkg, obj.cmdline_options);
+	else
+		load_sub(*pkg);
+
+	if(obj.build_type)
+		pkg->set_build_type(*obj.build_type);
+}