X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=96df23b7df5c0394800fa21caf59160fff8cdac0;hb=a5b439969c06a4794a3914580a29256773f24778;hp=274b153e70c566a2fa2dff2147918cc2d2474a37;hpb=b98c297b0826c78521e54a0120cf20737a9e2727;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 274b153..96df23b 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,321 +1,396 @@
-#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 <set>
+#include <cstdlib>
+#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 <msp/time/utils.h>
-#include "action.h"
 #include "analyzer.h"
+#include "binarypackage.h"
 #include "builder.h"
-#include "executable.h"
-#include "header.h"
-#include "install.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 "package.h"
-#include "systemlibrary.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()),
-	build_file("Build"),
-	do_build(true),
+	package_manager(*this),
+	main_pkg(0),
+	native_arch(*this, string()),
+	vfs(*this),
 	analyzer(0),
+	build(false),
+	clean(0),
+	dry_run(false),
+	help(false),
+	show_progress(false),
+	build_file("Build"),
 	jobs(1),
-	chrome(false)
+	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;
+	bool no_externals = false;
+	unsigned verbose = 1;
+	bool silent = false;
+	list<string> log_channels;
+
 	GetOpt getopt;
-	getopt.add_option(GetOpt::Option('v', "verbose", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('a', "analyze", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option('b', "build", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option("max-depth", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option('n', "dry-run", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option('B', "build-all", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('C', "chdir", GetOpt::REQUIRED));
-	getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1"));
-	getopt.add_option(GetOpt::Option('h', "help", 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("chrome", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
-	getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
-	int index=getopt(argc, argv);
-
-	verbose+=getopt['v'].count();
-
-	if(getopt['a'])
+	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('l', "log",        log_channels,  GetOpt::REQUIRED_ARG).set_help("Set log channels to be displayed.", "LIST");
+	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('s', "silent",     silent,        GetOpt::NO_ARG).set_help("Don't print any messages other than errors.");
+	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("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(silent)
+		--verbose;
+	if(verbose>=1)
+	{
+		logger.enable_channel("summary");
+		logger.enable_channel("tasks");
+	}
+	if(verbose>=2)
+	{
+		logger.enable_channel("packages");
+		logger.enable_channel("commands");
+	}
+	if(verbose>=3)
+	{
+		logger.enable_channel("packagemgr");
+		logger.enable_channel("configure");
+	}
+	if(verbose>=4)
+	{
+		logger.enable_channel("files");
+		logger.enable_channel("auxcommands");
+	}
+	if(verbose>=5)
+	{
+		logger.enable_channel("tools");
+		logger.enable_channel("vfs");
+	}
+	for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
 	{
-		analyzer=new Analyzer(*this);
+		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);
 
-		string mode=getopt['a'].arg();
-		if(mode=="deps")
+		if(analyze_mode=="deps")
 			analyzer->set_mode(Analyzer::DEPS);
-		else if(mode=="alldeps")
+		else if(analyze_mode=="alldeps")
 			analyzer->set_mode(Analyzer::ALLDEPS);
-		else if(mode=="rebuild")
+		else if(analyze_mode=="rebuild")
 			analyzer->set_mode(Analyzer::REBUILD);
-		else if(mode=="rdeps")
+		else if(analyze_mode=="rdeps")
 			analyzer->set_mode(Analyzer::RDEPS);
 		else
-			throw UsageError("Invalid analysis mode");
-
-		if(getopt["max-depth"])
-			analyzer->set_max_depth(strtol(getopt["max-depth"].arg()));
-		analyzer->set_full_paths(getopt["full-paths"]);
+			throw usage_error("Invalid analyze mode");
 
-		if(!getopt['b'])
-			do_build=false;
+		analyzer->set_max_depth(max_depth);
+		analyzer->set_full_paths(full_paths);
 	}
+	else if(!clean && !create_makefile)
+		build = true;
 
-	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'];
-
-	if(getopt['C'])
-		chdir(getopt['C'].arg().c_str());
-
-	for(int i=index; i<argc; ++i)
+	const vector<string> &args = getopt.get_args();
+	for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
 	{
-		string v(argv[i]);
-		unsigned equal=v.find('=');
+		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(StringMap::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");
 
-	if(getopt['W'])
-		what_if.push_back(getopt['W'].arg());
-}
+	if(!work_dir.empty())
+		FS::chdir(work_dir);
 
-/**
-Gets a package with the specified name, possibly creating it.
+	cwd = FS::getcwd();
 
-@param   n  Package name
+	package_manager.set_no_externals(no_externals);
 
-@return  Pointer to the package, or 0 if the package could not be located
-*/
-Package *Builder::get_package(const string &n)
-{
-	PackageMap::iterator i=packages.find(n);
-	if(i!=packages.end())
-		return i->second;
+	load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
+	load_build_file((FS::get_user_data_dir("builder")/"rc").str());
 
-	// 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;
-		}
+	if(arch.empty())
+		current_arch = &native_arch;
+	else
+		current_arch = new Architecture(*this, arch);
 
-	// 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);
+	if(!current_arch->is_native())
+	{
+		for(StringMap::const_iterator i=cross_prefixes.begin(); i!=cross_prefixes.end(); ++i)
+			if(current_arch->match_name(i->first))
+			{
+				current_arch->set_cross_prefix(i->second);
+				break;
+			}
+	}
 
-	return pkg;
-}
+	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());
+	}
 
-/**
-Returns the target with the given name, or 0 if no such target exists.
-*/
-Target *Builder::get_target(const string &n)
-{
-	TargetMap::iterator i=targets.find(n);
-	if(i!=targets.end())
-		return i->second;
-	return 0;
+	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));
 }
 
-/**
-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)
+Builder::~Builder()
 {
-	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(Path::getcwd()/ *j/fn)))
-			return tgt;
-	
-	return 0;
+	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+		delete i->second;
+	delete analyzer;
 }
 
-Target *Builder::get_library(const string &lib, const list<string> &path)
+int Builder::main()
 {
-	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)
+	if(prefix.str()!="/usr")
 	{
-		string full=(Path::getcwd()/ *j/basename).str();
-		Target *tgt=get_target(full);
-		if(tgt) return tgt;
-		
-		if(Path::exists(full))
+		FS::Path pcdir = prefix/"lib"/"pkgconfig";
+		if(const char *pcp = getenv("PKG_CONFIG_PATH"))
 		{
-			add_target(tgt=new SystemLibrary(*this, full));
-			return tgt;
+			vector<string> path = split(pcp, ':');
+			bool found = false;
+			for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
+				found = (*i==pcdir.str());
+			if(!found)
+			{
+				path.push_back(pcdir.str());
+				setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
+			}
 		}
+		else
+			setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true);
 	}
 
-	return 0;
-}
-
-int Builder::main()
-{
 	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(0, "builder", false);
+			return 0;
+		}
+		else
+		{
+			IO::print(IO::cerr, "No build info here.\n");
+			return 1;
+		}
 	}
 
-	std::list<std::string> missing;
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-		if(!i->second)
-			missing.push_back(i->first);
+	main_pkg->configure(cmdline_options, conf_all?2:1);
 
-	if(!missing.empty())
+	if(help)
 	{
-		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;
+		usage(0, "builder", false);
+		IO::print("\n");
+		package_help();
+		return 0;
 	}
 
-	default_pkg->create_build_info();
+	if(conf_only)
+		return 0;
 
 	if(create_targets())
 		return 1;
 
-	cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
-	if(verbose>=2)
+	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));
+
+	const PackageManager::PackageMap &packages = package_manager.get_packages();
+	list<string> package_details;
+	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
 	{
-		for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+		if(!i->second || !i->second->is_configured())
+			continue;
+
+		string line = i->second->get_name();
+		if(dynamic_cast<SourcePackage *>(i->second))
 		{
-			cout<<' '<<i->second->get_name();
-			if(i->second->get_buildable())
-				cout<<'*';
-			unsigned count=0;
-			unsigned ood_count=0;
+			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->get_rebuild())
-						++ood_count;
+					if(j->second->needs_rebuild())
+						++to_be_built;
 				}
 			if(count)
 			{
-				cout<<" ("<<count<<" targets";
-				if(ood_count)
-					cout<<", "<<ood_count<<" out-of-date";
-				cout<<")\n";
+				line += format(" (%d targets", count);
+				if(to_be_built)
+					line += format(", %d to be built", to_be_built);
+				line += ')';
 			}
 		}
+
+		package_details.push_back(line);
 	}
 
+	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();
 
-	if(do_build)
-		build();
+	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);
+		if(!analyzer)
+			IO::print(IO::cerr, "Please fix them and try again.\n");
+		return 1;
+	}
+
+	if(clean)
+		exit_code = do_clean();
+	else if(build)
+		exit_code = do_build();
 
 	return exit_code;
 }
 
-Builder::~Builder()
+Target *Builder::get_target(const string &n) const
 {
-	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;
+	TargetMap::const_iterator i = targets.find(n);
+	if(i!=targets.end())
+		return i->second;
+	return 0;
+}
+
+void Builder::apply_profile_template(Config &config, const string &pt) const
+{
+	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);
+	}
 }
 
-int Builder::load_build_file(const Path::Path &fn)
+void Builder::problem(const string &p, const string &d)
 {
-	ifstream in(fn.str().c_str());
-	if(!in)
+	problems.push_back(Problem(p, d));
+}
+
+void Builder::add_target(Target *t)
+{
+	targets.insert(TargetMap::value_type(t->get_name(), t));
+}
+
+void Builder::usage(const char *reason, const char *argv0, bool brief)
+{
+	if(reason)
+		IO::print(IO::cerr, "%s\n", reason);
+
+	if(brief)
+		IO::print(IO::cerr, "Usage: %s\n", usagemsg);
+	else
+	{
+		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);
+	}
+}
+
+int Builder::load_build_file(const FS::Path &fn)
+{
+	if(!FS::exists(fn))
 		return -1;
 
-	Parser::Parser parser(in, fn.str());
+	IO::BufferedFile in(fn.str());
+
+	logger.log("files", format("Reading %s", fn));
+
+	DataFile::Parser parser(in, fn.str());
 	Loader loader(*this, fn.subpath(0, fn.size()-1));
 	loader.load(parser);
 
@@ -324,265 +399,258 @@ int Builder::load_build_file(const Path::Path &fn)
 
 int Builder::create_targets()
 {
-	Target *world=new VirtualTarget(*this, "world");
-	add_target(world);
+	Target *world = new VirtualTarget(*this, "world");
 
-	Target *def_tgt=new VirtualTarget(*this, "default");
-	add_target(def_tgt);
+	Target *def_tgt = new VirtualTarget(*this, "default");
 	world->add_depend(def_tgt);
 
-	Target *install=new VirtualTarget(*this, "install");
-	add_target(install);
+	Target *install = new VirtualTarget(*this, "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;
+	Target *tarballs = new VirtualTarget(*this, "tarballs");
+	world->add_depend(tarballs);
 
-		Path::Path inst_base;
-		if(i->second->get_config().is_option("prefix"))
-			inst_base=i->second->get_config().get_option("prefix").value;
+	const PackageManager::PackageMap &packages = package_manager.get_packages();
+	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+		if(i->second && i->second->is_configured())
+			i->second->create_targets();
 
-		const ComponentList &components=i->second->get_components();
-		for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
+	// Make the cmdline target depend on all targets mentioned on the command line
+	Target *cmdline = new VirtualTarget(*this, "cmdline");
+	for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
+	{
+		Target *tgt = get_target(*i);
+		if(!tgt)
+			tgt = vfs.get_target(*i);
+		if(!tgt)
+			tgt = vfs.get_target(cwd/ *i);
+		if(!tgt)
 		{
-			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);
-			}
-
-			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);
-					}
-				}
-			}
-
-			if(build_exe)
-			{
-				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);
-
-				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);
-					}
-				}
-			}
+			IO::print("I don't know anything about %s\n", *i);
+			return -1;
 		}
-	}
 
-	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);
+		cmdline->add_depend(tgt);
 	}
 
-	for(list<string>::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+	cmdline->prepare();
+
+	// Apply what-ifs
+	for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
 	{
-		Target *tgt=get_target((cwd/ *i).str());
+		FileTarget *tgt = vfs.get_target(cwd/ *i);
 		if(!tgt)
 		{
-			cerr<<"Unknown what-if target "<<*i<<'\n';
+			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
 			return -1;
 		}
 		tgt->touch();
 	}
 
-	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)
+	if(build_all)
 	{
-		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(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+			if(i->second->is_buildable() && !i->second->needs_rebuild())
+				i->second->force_rebuild();
 	}
 
-	world->prepare();
+	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+		if(SourcePackage *spkg = dynamic_cast<SourcePackage *>(i->second))
+			spkg->get_deps_cache().save();
 
 	return 0;
 }
 
-Target *Builder::check_header(const Msp::Path::Path &fn)
-{
-	Target *tgt=get_target(fn.str());
-	if(tgt) return tgt;
-
-	if(Path::exists(fn))
-	{
-		add_target(tgt=new SystemHeader(*this, fn.str()));
-		return tgt;
-	}
-	return 0;
-}
-
-void Builder::add_target(Target *t)
-{
-	targets.insert(TargetMap::value_type(t->get_name(), t));
-	new_tgts.push_back(t);
-}
-
-void Builder::update_hash(string &hash, const string &value)
+int Builder::do_build()
 {
-	for(unsigned i=0; i<value.size(); ++i)
-		hash[i%hash.size()]^=value[i];
-}
+	Target *cmdline = get_target("cmdline");
 
-/**
-This function supervises the build process, starting new actions when slots
-become available.
-*/
-int Builder::build()
-{
-	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;
 
-	unsigned total=cmdline->count_rebuild();
 	if(!total)
 	{
-		cout<<"Already up to date\n";
+		logger.log("summary", "Already up to date");
 		return 0;
 	}
-	cout<<"Will build "<<total<<" target(s)\n";
+	logger.log("summary", format("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;
 
 	while(!finish)
 	{
-		if(actions.size()<jobs && !fail)
+		if(tasks.size()<jobs && !fail)
 		{
-			Target *tgt=cmdline->get_buildable_target();
+			Target *tgt = cmdline->get_buildable_target();
 			if(tgt)
 			{
-				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(actions.empty())
-				finish=true;
+			else if(tasks.empty())
+				finish = 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 = 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;
 			}
 			else
 				++i;
 		}
 	}
 
-	return fail?-1:0;
+	if(show_progress)
+		IO::print("\033[K");
+	if(fail)
+		logger.log("summary", "Build failed");
+	else if(show_progress)
+		logger.log("summary", "Build complete");
+
+	return fail;
 }
 
-Application::RegApp<Builder> Builder::reg;
+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_depends();
+		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))
+			if(ft->get_mtime())
+				FS::unlink(ft->get_path());
+
+	return 0;
+}
 
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
+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");
+	}
+}
+
+string Builder::usagemsg;
+string Builder::helpmsg;
+
+
+Builder::Loader::Loader(Builder &b, const FS::Path &s):
 	bld(b),
 	src(s)
 {
+	add("binary_package", &Loader::binpkg);
+	add("cross_prefix", &Loader::cross_prefix);
+	add("profile", &Loader::profile);
 	add("package", &Loader::package);
 }
 
+void Builder::Loader::binpkg(const string &n)
+{
+	BinaryPackage *pkg = new BinaryPackage(bld, n);
+	load_sub(*pkg);
+}
+
+void Builder::Loader::cross_prefix(const string &a, const string &p)
+{
+	bld.cross_prefixes[a] = p;
+}
+
+void Builder::Loader::profile(const string &n)
+{
+	StringMap prf;
+	ProfileLoader ldr(prf);
+	load_sub_with(ldr);
+	bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
+}
+
 void Builder::Loader::package(const string &n)
 {
-	Package *pkg=new Package(bld, n, src);
+	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));
-	bld.new_pkgs.push_back(pkg);
 }
 
+
+Builder::ProfileLoader::ProfileLoader(StringMap &p):
+	profile(p)
+{
+	add("option", &ProfileLoader::option);
+}
+
+void Builder::ProfileLoader::option(const string &o, const string &v)
+{
+	profile.insert(StringMap::value_type(o, v));
+}