X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=c599e269408adb38d4b38c75808d19ef71dc83a6;hb=ac1f35e436dbe86f903dce2f49b002ff17f1ca50;hp=b77b8fc3d453f17d755115cdc23f480f3be99b63;hpb=3772879ebdf452eeb9e8e2c04c07338c4933a3ed;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index b77b8fc..c599e26 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,53 +1,49 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <iostream>
 #include <set>
-#include <msp/core/except.h>
 #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/except.h>
 #include <msp/io/file.h>
-#include <msp/strings/formatter.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 "header.h"
-#include "install.h"
-#include "misc.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 "pkgconfig.h"
+#include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
-#include "systemlibrary.h"
-#include "tarball.h"
-#include "unlink.h"
+#include "tar.h"
+#include "task.h"
 #include "virtualtarget.h"
 
 using namespace std;
 using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
-	main_pkg(0),
+	package_manager(*this),
+	native_arch(*this, string()),
+	build_type(0),
+	vfs(*this),
+	build_graph(*this),
 	analyzer(0),
 	build(false),
 	clean(0),
 	dry_run(false),
 	help(false),
-	verbose(1),
 	show_progress(false),
 	build_file("Build"),
 	jobs(1),
@@ -55,41 +51,77 @@ Builder::Builder(int argc, char **argv):
 	conf_only(false),
 	build_all(false),
 	create_makefile(false),
-	current_arch("native")
+	tempdir("temp")
 {
-	string   analyze_mode;
-	string   work_dir;
-	bool     full_paths=false;
-	unsigned max_depth=5;
-	StringList cmdline_warn;
-	string   prfx;
+	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);
-	getopt.add_option('b', "build",      build,        GetOpt::NO_ARG);
-	getopt.add_option('c', "clean",      clean,        GetOpt::NO_ARG);
-	getopt.add_option('f', "file",       build_file,   GetOpt::REQUIRED_ARG);
-	getopt.add_option('h', "help",       help,         GetOpt::NO_ARG);
-	getopt.add_option('j', "jobs",       jobs,         GetOpt::REQUIRED_ARG);
-	getopt.add_option('n', "dry-run",    dry_run,      GetOpt::NO_ARG);
-	getopt.add_option('v', "verbose",    verbose,      GetOpt::NO_ARG);
-	getopt.add_option('A', "conf-all",   conf_all,     GetOpt::NO_ARG);
-	getopt.add_option('B', "build-all",  build_all,    GetOpt::NO_ARG);
-	getopt.add_option('C', "chdir",      work_dir,     GetOpt::REQUIRED_ARG);
-	getopt.add_option('P', "progress",   show_progress, GetOpt::NO_ARG);
-	getopt.add_option('W', "what-if",    what_if,      GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "arch",       current_arch, GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "conf-only",  conf_only,    GetOpt::NO_ARG);
-	getopt.add_option(     "full-paths", full_paths,   GetOpt::NO_ARG);
-	//getopt.add_option(     "makefile",   create_makefile, GetOpt::NO_ARG);
-	getopt.add_option(     "max-depth",  max_depth,    GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "prefix",     prfx,         GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "warnings",   cmdline_warn, GetOpt::REQUIRED_ARG);
+	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)
+	{
+		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);
+		analyzer = new Analyzer(*this);
 
 		if(analyze_mode=="deps")
 			analyzer->set_mode(Analyzer::DEPS);
@@ -100,694 +132,340 @@ Builder::Builder(int argc, char **argv):
 		else if(analyze_mode=="rdeps")
 			analyzer->set_mode(Analyzer::RDEPS);
 		else
-			throw UsageError("Invalid analyze mode");
+			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;
+		build = true;
 
-	const vector<string> &args=getopt.get_args();
+	const vector<string> &args = getopt.get_args();
 	for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
 	{
-		unsigned equal=i->find('=');
+		string::size_type equal = i->find('=');
 		if(equal!=string::npos)
-			cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1)));
+			cmdline_options.insert(Config::InputOptions::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())
-		chdir(work_dir.c_str());
+		FS::chdir(work_dir);
 
-	cwd=FS::getcwd();
+	cwd = FS::getcwd();
 
-	Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).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");
+	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"));
 
-	load_build_file((FS::get_home_dir()/".builderrc").str());
+	package_manager.set_no_externals(no_externals);
 
-	if(prfx.empty())
-	{
-		if(current_arch=="native")
-			prefix=(FS::get_home_dir()/"local").str();
-		else
-			prefix=(FS::get_home_dir()/"local"/current_arch).str();
-	}
+	if(arch.empty())
+		current_arch = &native_arch;
 	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/"..");
-}
-
-/**
-Gets a package by name, possibly creating it.
+		current_arch = new Architecture(*this, arch);
 
-@param   name  Package name
+	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);
 
-@return  Pointer to the package, or 0 if the package could not be located
-*/
-Package *Builder::get_package(const string &name)
-{
-	PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch));
-	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;
-}
-
-/**
-Returns the target with the given name, or 0 if no such target exists.
-*/
-Target *Builder::get_target(const string &n) const
-{
-	TargetMap::const_iterator i=targets.find(n);
-	if(i!=targets.end())
-		return i->second;
-	return 0;
-}
-
-/**
-Tries to locate a header included from a given location and with a given include
-path.  Considers known targets as well as existing files.  If a matching target
-is not found but a file exists, a new SystemHeader target will be created and
-returned.
-*/
-Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
-{
-	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;
-
-	static string cxx_ver;
-	if(cxx_ver.empty())
-	{
-		StringList argv;
-		argv.push_back(get_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)
-			cout<<"C++ version is "<<cxx_ver<<'\n';
-	}
-
-	string fn=include.substr(1);
-	if(verbose>=5)
-		cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
-
-	StringList syspath;
-	if(current_arch=="native")
-		syspath.push_back("/usr/include");
-	else
-		syspath.push_back("/usr/"+get_architecture(current_arch).get_prefix()+"/include");
-	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).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;
-}
-
-/**
-Tries to locate a library with the given library path.  Considers known targets
-as well as existing files.  If a matching target is not found but a file exists,
-a new SystemLibrary target will be created and returned.
-
-@param   lib   Name of the library to get (without "lib" prefix or extension)
-@param   path  List of paths to search for the library
-@param   mode  Shared / static mode
-
-@return  Some kind of library target, if a match was found
-*/
-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=="native")
+	if(prfx.empty())
 	{
-		syspath.push_back("/lib");
-		syspath.push_back("/usr/lib");
+		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
-		syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
-
-	if(verbose>=5)
-		cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
-
-	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
-{
-	ArchMap::const_iterator i=archs.find(arch);
-	if(i==archs.end())
-		throw KeyError("Unknown architecture", arch);
-
-	return i->second;
-}
-
-const Architecture &Builder::get_current_arch() const
-{
-	return get_architecture(current_arch);
-}
+		prefix = cwd/prfx;
 
-void Builder::apply_profile_template(Config &config, const string &pt) const
-{
-	vector<string> parts=split(pt, '-');
+	if(!temp_str.empty())
+		tempdir = temp_str;
 
-	for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
+	if(!build_type_name.empty())
 	{
-		ProfileTemplateMap::const_iterator j=profile_tmpl.find(*i);
-		if(j==profile_tmpl.end())
-			continue;
-
-		config.update(j->second);
+		BuildTypeMap::iterator i = build_types.find(build_type_name);
+		if(i==build_types.end())
+			throw usage_error("Unknown build type");
+		build_type = &i->second;
 	}
-}
 
-void Builder::problem(const string &p, const string &d)
-{
-	problems.push_back(Problem(p, d));
+	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));
 }
 
-/**
-Adds a target to both the target map and the new target queue.  Called from
-Target constructor.
-*/
-void Builder::add_target(Target *t)
+Builder::~Builder()
 {
-	targets.insert(TargetMap::value_type(t->get_name(), t));
-	new_tgts.push_back(t);
+	delete analyzer;
 }
 
 int Builder::main()
 {
-	if(load_build_file(cwd/build_file))
+	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;
+		}
 	}
 
-	main_pkg->configure(cmdline_options, conf_all?2:1);
+	load_build_file(main_file);
 
 	if(help)
 	{
 		usage(0, "builder", false);
-		cout<<'\n';
+		IO::print("\n");
 		package_help();
 		return 0;
 	}
 
-	if(!conf_only && create_targets())
+	if(!prepare_build())
 		return 1;
 
-	PackageList all_reqs=main_pkg->collect_requires();
-
 	if(conf_only)
 		return 0;
 
-	if(verbose>=1)
-		cout<<all_reqs.size()<<" active 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));
+	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)
 	{
-		for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+		if(!i->second->is_prepared())
+			continue;
+
+		string line = i->second->get_name();
+		if(dynamic_cast<SourcePackage *>(i->second))
 		{
-			cout<<' '<<(*i)->get_name();
-			if(dynamic_cast<SourcePackage *>(*i))
-				cout<<'*';
-			unsigned count=0;
-			unsigned ood_count=0;
-			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
-				if(j->second->get_package()==*i)
+			line += '*';
+
+			unsigned count = 0;
+			unsigned to_be_built = 0;
+			const BuildGraph::TargetMap &targets = build_graph.get_targets();
+			for(BuildGraph::TargetMap::const_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<<')';
+				line += format(" (%d targets", count);
+				if(to_be_built)
+					line += format(", %d to be built", to_be_built);
+				line += ')';
 			}
-			cout<<'\n';
 		}
+
+		package_details.push_back(line);
 	}
 
+	logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_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(!problems.empty())
 	{
-		cerr<<"The following problems were detected:\n";
+		IO::print(IO::cerr, "The following problems were detected:\n");
 		for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
-			cerr<<"  "<<i->package<<": "<<i->descr<<'\n';
-		cerr<<"Please fix them and try again.\n";
+			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(create_makefile
-
 	if(clean)
-		exit_code=do_clean();
-	else if(build)
-		exit_code=do_build();
+		exit_code = do_clean();
+	if(build)
+		exit_code = do_build();
 
 	return exit_code;
 }
 
-Builder::~Builder()
+void Builder::problem(const string &p, const string &d)
 {
-	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;
+	problems.push_back(Problem(p, d));
 }
 
 void Builder::usage(const char *reason, const char *argv0, bool brief)
 {
 	if(reason)
-		cerr<<reason<<'\n';
+		IO::print(IO::cerr, "%s\n", reason);
 
 	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] [--conf-only] [--full-paths] [--max-depth NUM] [<target> ...]\n";
+		IO::print(IO::cerr, "Usage: %s\n", usagemsg);
 	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"
-			"  -P, --progress      Display progress while building.\n"
-			"  -W, --what-if FILE  Pretend that FILE has changed.\n"
-			"  --arch ARCH         Architecture to build for.\n"
-			"  --conf-only         Stop after configuring packages.\n"
-			"  --full-paths        Output full paths in analysis.\n"
-			//"  --makefile          Create a makefile for this package.\n"
-			"  --max-depth NUM     Maximum depth to show in analysis.\n"
-			"  --prefix DIR        Directory to install things to.\n"
-			"  --warnings LIST     Compiler warnings to use.\n";
-	}
-}
-
-/**
-Determines the source directory of a package.  pkg-config is consulted first,
-and if it fails, the package path is searched for matches.
-*/
-FS::Path Builder::get_package_location(const string &name)
-{
-	if(verbose>=3)
-		cout<<"Looking for package "<<name<<'\n';
-
-	// 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)
-		cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
-	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> 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)
-			cout<<pkg_dirs.size()<<" packages found in path\n";
-	}
-
-	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('-');
-
-		if(!base.compare(0, dash, name))
-			return *i;
-		else if(msp && !base.compare(0, dash-3, name, 3, string::npos))
-			return *i;
+		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);
 	}
-
-	return FS::Path();
 }
 
-/**
-Loads the given build file.
-
-@param   fn  Path to the file
-
-@return  0 on success, -1 if the file could not be opened
-*/
-int Builder::load_build_file(const FS::Path &fn)
+void Builder::load_build_file(const FS::Path &fn)
 {
-	try
-	{
-		IO::File inf(fn.str());
-		IO::Buffered in(inf);
-
-		if(verbose>=3)
-			cout<<"Reading "<<fn<<'\n';
+	IO::BufferedFile in(fn.str());
 
-		DataFile::Parser parser(in, fn.str());
-		Loader loader(*this, fn.subpath(0, fn.size()-1));
-		loader.load(parser);
-	}
-	catch(const IO::FileNotFound &)
-	{
-		return -1;
-	}
+	logger.log("files", format("Reading %s", fn));
 
-	return 0;
+	DataFile::Parser parser(in, fn.str());
+	Loader loader(*this);
+	loader.load(parser);
 }
 
-/**
-Creates targets for all packages and prepares them for building.
-
-@return  0 if everything went ok, -1 if something bad happened and a build
-         shouldn't be attempted
-*/
-int Builder::create_targets()
+bool Builder::prepare_build()
 {
-	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));
-		}
+	package_manager.get_main_package().prepare();
 
-		tarballs->add_depend(new TarBall(*this, *spkg));
-	}
-
-	// Find dependencies until no new targets are created
-	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);
-	}
-
-	// Apply what-ifs
-	for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+	// Add targets from command line as goals
+	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
 	{
-		Target *tgt=get_target((cwd/ *i).str());
+		Target *tgt = build_graph.get_target(*i);
 		if(!tgt)
-		{
-			cerr<<"Unknown what-if target "<<*i<<'\n';
-			return -1;
-		}
-		tgt->touch();
-	}
-
-	// 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)
-	{
-		Target *tgt=get_target(*i);
+			tgt = vfs.get_target(*i);
 		if(!tgt)
-			tgt=get_target((cwd/ *i).str());
+			tgt = vfs.get_target(cwd/ *i);
 		if(!tgt)
 		{
-			cerr<<"I don't know anything about "<<*i<<'\n';
-			return -1;
+			IO::print("I don't know anything about %s\n", *i);
+			return false;
 		}
-		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. */
-	if(build_world)
-		cmdline->prepare();
-	else
-	{
-		world->add_depend(cmdline);
-		world->prepare();
-	}
-
-	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;
-}
-
-/**
-Check if a header exists, either as a target or a file.  Either an existing
-target or a new SystemHeader target will be returned.
-*/
-Target *Builder::get_header(const Msp::FS::Path &fn)
-{
-	Target *tgt=get_target(fn.str());
-	if(tgt) return tgt;
-
-	if(FS::is_reg(fn))
-	{
-		tgt=new SystemHeader(*this, fn.str());
-		return tgt;
+		build_graph.add_goal(*tgt);
 	}
-	return 0;
-}
 
-Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
-{
-	// Populate a list of candidate filenames
-	StringList candidates;
+	build_graph.prepare();
 
-	if(mode!=ALL_STATIC)
+	// Apply what-ifs
+	for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
 	{
-		if(current_arch=="win32")
+		FileTarget *tgt = vfs.get_target(cwd/ *i);
+		if(!tgt)
 		{
-			candidates.push_back("lib"+lib+".dll");
-			candidates.push_back(lib+".dll");
+			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
+			return false;
 		}
-		else
-			candidates.push_back("lib"+lib+".so");
+		tgt->touch();
 	}
 
-	/* Static libraries are always considered, since sometimes shared versions
-	may not be available */
-	candidates.push_back("lib"+lib+".a");
-	if(current_arch=="win32")
-		candidates.push_back("lib"+lib+".dll.a");
+	if(build_all)
+		build_graph.force_full_rebuild();
 
-	for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
+	if(!dry_run)
 	{
-		string full=(path/ *i).str();
-		Target *tgt=get_target(full);
-
-		if(tgt)
-		{
-			Target *real_tgt=tgt;
-			if(dynamic_cast<Install *>(tgt))
-				real_tgt=real_tgt->get_depends().front();
-
-			/* 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;
-		}
+		const PackageManager::PackageMap &packages = package_manager.get_packages();
+		for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+			i->second->save_caches();
 	}
 
-	return 0;
-}
-
-/**
-Updates a hash with a string.  This is used from get_header and get_library.
-*/
-void Builder::update_hash(string &hash, const string &value)
-{
-	for(unsigned i=0; i<value.size(); ++i)
-		hash[i%hash.size()]^=value[i];
+	return true;
 }
 
-/**
-This function supervises the build process, starting new actions when slots
-become available.
-*/
 int Builder::do_build()
 {
-	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";
+		logger.log("summary", "Already up to date");
 		return 0;
 	}
-	if(verbose>=1)
-		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;
 
-	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(show_progress)
+				if(tgt->get_tool())
+					logger.log("tasks", format("%-4s  %s", tgt->get_tool()->get_tag(), tgt->get_name()));
+				Task *task = tgt->build();
+				if(task)
 				{
-					cout<<count<<" of "<<total<<" targets built\033[1G";
-					cout.flush();
+					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;
@@ -795,129 +473,128 @@ int Builder::do_build()
 	}
 
 	if(show_progress)
-		cout<<"\033[K";
+		IO::print("\033[K");
 	if(fail)
-		cout<<"Build failed\n";
+		logger.log("summary", "Build failed");
 	else if(show_progress)
-		cout<<"Build complete\n";
+		logger.log("summary", "Build complete");
 
-	return fail?1: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 fail;
 }
 
-/**
-Cleans buildable targets.  If clean is 1, cleans only this package.  If
-clean is 2 or greater, cleans all buildable packages.
-*/
 int Builder::do_clean()
 {
 	// 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_target("cmdline"));
 
 	while(!queue.empty())
 	{
-		Target *tgt=queue.front();
+		Target *tgt = queue.front();
 		queue.erase(queue.begin());
 
-		if(tgt->get_buildable() && (tgt->get_package()==main_pkg || clean>=2))
+		if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || clean>=2))
 			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)
 	{
-		Action *action=new Unlink(*this, **i);
-		while(action->check()<0) ;
-		delete action;
+		logger.log("tasks", format("RM    %s", (*i)->get_name()));
+		if(!dry_run)
+			(*i)->clean();
 	}
 
 	return 0;
 }
 
-/**
-Prints out information about the default package.
-*/
 void Builder::package_help()
 {
-	const Config &config=main_pkg->get_config();
-	const Config::OptionMap &options=config.get_options();
+	SourcePackage &main_pkg = dynamic_cast<SourcePackage &>(package_manager.get_main_package());
+	const Config &config = main_pkg.get_config();
+	const Config::OptionMap &options = config.get_options();
 
-	cout<<"Required packages:\n  ";
-	const PackageList &requires=main_pkg->get_requires();
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+	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())
-			cout<<", ";
-		cout<<(*i)->get_name();
+			IO::print(", ");
+		IO::print((*i)->get_name());
 	}
-	cout<<"\n\n";
-	cout<<"Package configuration:\n";
+	IO::print("\n\nPackage configuration:\n");
 	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
 	{
-		const Config::Option &opt=i->second;
-		cout<<"  "<<opt.name<<": "<<opt.descr<<" ("<<opt.value<<") ["<<opt.defv<<"]\n";
+		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");
 	}
 }
 
-Application::RegApp<Builder> Builder::reg;
+string Builder::usagemsg;
+string Builder::helpmsg;
 
 
-Builder::Loader::Loader(Builder &b, const FS::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::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)
+void Builder::Loader::profile(const string &)
 {
-	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));
+	IO::print("Profiles are deprecated\n");
 }
 
-
-Builder::ProfileLoader::ProfileLoader(StringMap &p):
-	profile(p)
+void Builder::Loader::package(const string &n)
 {
-	add("option", &ProfileLoader::option);
-}
+	SourcePackage *pkg = new SourcePackage(obj, n, get_source());
 
-void Builder::ProfileLoader::option(const string &o, const string &v)
-{
-	profile.insert(StringMap::value_type(o, v));
+	if(obj.conf_all || pkg==&obj.package_manager.get_main_package())
+		load_sub(*pkg, obj.cmdline_options);
+	else
+		load_sub(*pkg);
+
+	if(obj.build_type)
+		pkg->set_build_type(*obj.build_type);
 }