X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuilder.cpp;h=7135a8d97b1a42a4e6aa24860ade31c32fa4f9b4;hb=83d2a8a39e0a09733ffc666d7f885fc328b831f2;hp=286f53b049cf8284b770821b0098fe58a4f2c77c;hpb=3585dea6eabf5f1565886bf09c2bdb2eee978912;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 286f53b..7135a8d 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,12 +1,12 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
 #include <set>
+#include <cstdlib>
 #include <sys/utsname.h>
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
@@ -17,6 +17,7 @@ Distributed under the LGPL
 #include <msp/io/buffered.h>
 #include <msp/io/except.h>
 #include <msp/io/file.h>
+#include <msp/io/print.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -34,13 +35,23 @@ Distributed under the LGPL
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "systemlibrary.h"
-#include "tarball.h"
 #include "unlink.h"
 #include "virtualtarget.h"
 
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+void update_hash(string &hash, const string &value)
+{
+	for(unsigned i=0; i<value.size(); ++i)
+		hash[i%hash.size()]^=value[i];
+}
+
+}
+
+
 Builder::Builder(int argc, char **argv):
 	main_pkg(0),
 	analyzer(0),
@@ -57,35 +68,36 @@ Builder::Builder(int argc, char **argv):
 	build_all(false),
 	create_makefile(false)
 {
-	string   analyze_mode;
-	string   work_dir;
-	bool     full_paths=false;
+	string analyze_mode;
+	string work_dir;
+	bool full_paths=false;
 	unsigned max_depth=5;
 	StringList cmdline_warn;
-	string   prfx;
-	string   arch;
+	string prfx;
+	string arch;
 
 	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",       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 analysis.  MODE can be deps, alldeps or rebuild.", "MODE");
+	getopt.add_option('b', "build",      build,         GetOpt::NO_ARG).set_help("Perform build even if doing analysis.");
+	getopt.add_option('c', "clean",      clean,         GetOpt::NO_ARG).set_help("Clean buildable targets.");
+	getopt.add_option('f', "file",       build_file,    GetOpt::REQUIRED_ARG).set_help("Read info from FILE instead of Build.", "FILE");
+	getopt.add_option('h', "help",       help,          GetOpt::NO_ARG).set_help("Print this message.");
+	getopt.add_option('j', "jobs",       jobs,          GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM");
+	getopt.add_option('n', "dry-run",    dry_run,       GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
+	getopt.add_option('v', "verbose",    verbose,       GetOpt::NO_ARG).set_help("Print more information about what's going on.");
+	getopt.add_option('A', "conf-all",   conf_all,      GetOpt::NO_ARG).set_help("Apply configuration to all packages.");
+	getopt.add_option('B', "build-all",  build_all,     GetOpt::NO_ARG).set_help("Build all targets unconditionally.");
+	getopt.add_option('C', "chdir",      work_dir,      GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR");
+	getopt.add_option('P', "progress",   show_progress, GetOpt::NO_ARG).set_help("Display progress while building.");
+	getopt.add_option('W', "what-if",    what_if,       GetOpt::REQUIRED_ARG).set_help("Pretend that FILE has changed.", "FILE");
+	getopt.add_option(     "arch",       arch,          GetOpt::REQUIRED_ARG).set_help("Architecture to build for.", "ARCH");
+	getopt.add_option(     "conf-only",  conf_only,     GetOpt::NO_ARG).set_help("Stop after configuring packages.");
+	getopt.add_option(     "full-paths", full_paths,    GetOpt::NO_ARG).set_help("Output full paths in analysis.");
+	getopt.add_option(     "max-depth",  max_depth,     GetOpt::REQUIRED_ARG).set_help("Maximum depth to show in analysis.", "NUM");
+	getopt.add_option(     "prefix",     prfx,          GetOpt::REQUIRED_ARG).set_help("Directory to install things to.", "DIR");
+	getopt.add_option(     "warnings",   cmdline_warn,  GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST");
+	usagemsg=getopt.generate_usage(argv[0])+" [<target> ...]";
+	helpmsg=getopt.generate_help();
 	getopt(argc, argv);
 
 	if(!analyze_mode.empty())
@@ -123,7 +135,7 @@ Builder::Builder(int argc, char **argv):
 		cmdline_targets.push_back("default");
 
 	if(!work_dir.empty())
-		chdir(work_dir.c_str());
+		FS::chdir(work_dir);
 
 	cwd=FS::getcwd();
 
@@ -139,6 +151,7 @@ Builder::Builder(int argc, char **argv):
 	native_arch->set_tool("LXX", "g++");
 	native_arch->set_tool("AR",  "ar");
 
+	load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
 	load_build_file((FS::get_home_dir()/".builderrc").str());
 
 	if(arch.empty())
@@ -171,16 +184,148 @@ Builder::Builder(int argc, char **argv):
 	pkg_path.push_back(cwd/"..");
 }
 
-/**
-Gets a package by name, possibly creating it.
+Builder::~Builder()
+{
+	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+		delete i->second;
+	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+		delete i->second;
+	delete analyzer;
+}
 
-@param   name  Package name
+int Builder::main()
+{
+	if(prefix.str()!="/usr")
+	{
+		FS::Path pcdir=prefix/"lib"/"pkgconfig";
+		if(const char *pcp=getenv("PKG_CONFIG_PATH"))
+		{
+			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);
+	}
+
+	if(load_build_file(cwd/build_file))
+	{
+		if(help)
+		{
+			usage(0, "builder", false);
+			return 0;
+		}
+		else
+		{
+			IO::print(IO::cerr, "No build info here.\n");
+			return 1;
+		}
+	}
+
+	main_pkg->configure(cmdline_options, conf_all?2:1);
+
+	if(help)
+	{
+		usage(0, "builder", false);
+		IO::print("\n");
+		package_help();
+		return 0;
+	}
+
+	if(!conf_only && create_targets())
+		return 1;
+
+	PackageList all_reqs=main_pkg->collect_requires();
+
+	if(conf_only)
+		return 0;
+
+	if(verbose>=2)
+		IO::print("Building on %s, for %s\n", native_arch->get_name(), current_arch->get_name());
+	if(verbose>=1)
+		IO::print("%d active packages, %d targets\n", all_reqs.size(), targets.size());
+	if(verbose>=2)
+	{
+		for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+		{
+			IO::print(" %s", (*i)->get_name());
+			if(dynamic_cast<SourcePackage *>(*i))
+				IO::print("*");
+			unsigned count=0;
+			unsigned ood_count=0;
+			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+				if(j->second->get_package()==*i)
+				{
+					++count;
+					if(j->second->get_rebuild())
+						++ood_count;
+				}
+			if(count)
+			{
+				IO::print(" (%d targets", count);
+				if(ood_count)
+					IO::print(", %d out-of-date", ood_count);
+				IO::print(")");
+			}
+			IO::print("\n");
+		}
+	}
+
+	if(analyzer)
+		analyzer->analyze();
+
+	if(!problems.empty())
+	{
+		IO::print(IO::cerr, "The following problems were detected:\n");
+		for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
+			IO::print(IO::cerr, "  %s: %s\n", i->package, i->descr);
+		IO::print(IO::cerr, "Please fix them and try again.\n");
+		return 1;
+	}
+
+	if(clean)
+		exit_code=do_clean();
+	else if(build)
+		exit_code=do_build();
+
+	return exit_code;
+}
+
+string Builder::run_pkgconfig(const string &pkg, const string &what)
+{
+	list<string> argv;
+	argv.push_back("pkg-config");
+	if(what=="cflags" || what=="libs")
+		argv.push_back("--"+what);
+	else if(what=="flags")
+	{
+		argv.push_back("--cflags");
+		argv.push_back("--libs");
+	}
+	else
+		argv.push_back("--variable="+what);
+	argv.push_back(pkg);
+
+	if(verbose>=4)
+		IO::print("Running %s\n", join(argv.begin(), argv.end()));
+
+	int status;
+	string res=run_command(argv, &status);
+	if(status)
+		throw Exception(format("pkg-config for package %s failed", pkg));
+
+	return res;
+}
 
-@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));
+	PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name()));
 	if(i==packages.end())
 		i=packages.find(name);
 	if(i!=packages.end())
@@ -194,38 +339,36 @@ Package *Builder::get_package(const string &name)
 			return i->second;
 	}
 
-	// Package source not found - create a binary package
-	Package *pkg=BinaryPackage::from_pkgconfig(*this, name);
+	Package *pkg=0;
+	try
+	{
+		// Package source not found - create a binary package
+		pkg=BinaryPackage::from_pkgconfig(*this, name);
+	}
+	catch(...)
+	{
+		problem(name, "not found");
+	}
 
 	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
 {
+	// XXX Used for getting targets by path.  get_target(const FS::Path &)?
 	TargetMap::const_iterator i=targets.find(n);
 	if(i!=targets.end())
 		return i->second;
 	return 0;
 }
 
-/**
-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)
+Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
 {
 	string hash(8, 0);
-	update_hash(hash, from);
+	if(include[0]=='\"')
+		update_hash(hash, from.str());
 	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
 		update_hash(hash, *i);
 
@@ -238,7 +381,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 	if(cxx_ver.empty())
 	{
 		StringList argv;
-		argv.push_back(get_current_arch().get_tool("CXX"));
+		argv.push_back(current_arch->get_tool("CXX"));
 		argv.push_back("--version");
 		cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
 		while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
@@ -249,19 +392,19 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 			cxx_ver.erase(dot);
 		}
 		if(verbose>=5)
-			cout<<"C++ version is "<<cxx_ver<<'\n';
+			IO::print("C++ version is %s\n", cxx_ver);
 	}
 
 	string fn=include.substr(1);
 	if(verbose>=5)
-		cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
+		IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
 
 	StringList syspath;
 	if(current_arch->is_native())
 		syspath.push_back("/usr/include");
 	else
 		syspath.push_back("/usr/"+current_arch->get_prefix()+"/include");
-	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).str());
+	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
 
 	Target *tgt=0;
 	if(include[0]=='\"')
@@ -276,17 +419,6 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 	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);
@@ -305,10 +437,10 @@ Target *Builder::get_library(const string &lib, const list<string> &path, LibMod
 		syspath.push_back("/usr/lib");
 	}
 	else
-		syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
+		syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
 
 	if(verbose>=5)
-		cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
+		IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
 
 	Target *tgt=0;
 	for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
@@ -349,159 +481,41 @@ void Builder::problem(const string &p, const string &d)
 	problems.push_back(Problem(p, d));
 }
 
-/**
-Adds a target to both the target map and the new target queue.  Called from
-Target constructor.
-*/
 void Builder::add_target(Target *t)
 {
 	targets.insert(TargetMap::value_type(t->get_name(), t));
 	new_tgts.push_back(t);
 }
 
-int Builder::main()
-{
-	if(load_build_file(cwd/build_file))
-	{
-		cerr<<"No build info here.\n";
-		return 1;
-	}
-
-	main_pkg->configure(cmdline_options, conf_all?2:1);
-
-	if(help)
-	{
-		usage(0, "builder", false);
-		cout<<'\n';
-		package_help();
-		return 0;
-	}
-
-	if(!conf_only && create_targets())
-		return 1;
-
-	PackageList all_reqs=main_pkg->collect_requires();
-
-	if(conf_only)
-		return 0;
-
-	if(verbose>=2)
-		cout<<"Building on "<<native_arch->get_name()<<", for "<<current_arch->get_name()<<'\n';
-	if(verbose>=1)
-		cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
-	if(verbose>=2)
-	{
-		for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-		{
-			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)
-				{
-					++count;
-					if(j->second->get_rebuild())
-						++ood_count;
-				}
-			if(count)
-			{
-				cout<<" ("<<count<<" targets";
-				if(ood_count)
-					cout<<", "<<ood_count<<" out-of-date";
-				cout<<')';
-			}
-			cout<<'\n';
-		}
-	}
-
-	if(analyzer)
-		analyzer->analyze();
-
-	if(!problems.empty())
-	{
-		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";
-		return 1;
-	}
-
-	//if(create_makefile
-
-	if(clean)
-		exit_code=do_clean();
-	else if(build)
-		exit_code=do_build();
-
-	return exit_code;
-}
-
-Builder::~Builder()
-{
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-		delete i->second;
-	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-		delete i->second;
-	delete analyzer;
-}
-
 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";
+		IO::print(IO::cerr, "Usage: %s [options] [<target> ...]\n\n", argv0);
+		IO::print(IO::cerr, "Options:\n");
+		IO::print(IO::cerr, helpmsg);
 	}
 }
 
-/**
-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';
+		IO::print("Looking for package %s\n", name);
 
-	// Try to get source directory with pkgconfig
-	list<string> argv;
-	argv.push_back("pkg-config");
-	argv.push_back("--variable=source");
-	argv.push_back(name);
-	if(verbose>=4)
-		cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
-	string srcdir=strip(run_command(argv));
-	if(!srcdir.empty())
-		return srcdir;
+	try
+	{
+		// Try to get source directory with pkgconfig
+		string srcdir=strip(run_pkgconfig(name, "source"));
+		if(!srcdir.empty())
+			return srcdir;
+	}
+	catch(...)
+	{ }
 
 	if(pkg_dirs.empty())
 	{
@@ -516,7 +530,7 @@ FS::Path Builder::get_package_location(const string &name)
 			}
 		}
 		if(verbose>=3)
-			cout<<pkg_dirs.size()<<" packages found in path\n";
+			IO::print("%d packages found in path\n", pkg_dirs.size());
 	}
 
 	bool msp=!name.compare(0, 3, "msp");
@@ -534,22 +548,14 @@ FS::Path Builder::get_package_location(const string &name)
 	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)
 {
 	try
 	{
-		IO::File inf(fn.str());
-		IO::Buffered in(inf);
+		IO::BufferedFile in(fn.str());
 
 		if(verbose>=3)
-			cout<<"Reading "<<fn<<'\n';
+			IO::print("Reading %s\n", fn);
 
 		DataFile::Parser parser(in, fn.str());
 		Loader loader(*this, fn.subpath(0, fn.size()-1));
@@ -563,12 +569,6 @@ int Builder::load_build_file(const FS::Path &fn)
 	return 0;
 }
 
-/**
-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()
 {
 	Target *world=new VirtualTarget(*this, "world");
@@ -598,8 +598,6 @@ int Builder::create_targets()
 			PkgConfig *pc=new PkgConfig(*this, *spkg);
 			install->add_depend(new Install(*this, *spkg, *pc));
 		}
-
-		tarballs->add_depend(new TarBall(*this, *spkg));
 	}
 
 	// Find dependencies until no new targets are created
@@ -618,7 +616,7 @@ int Builder::create_targets()
 		Target *tgt=get_target((cwd/ *i).str());
 		if(!tgt)
 		{
-			cerr<<"Unknown what-if target "<<*i<<'\n';
+			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
 			return -1;
 		}
 		tgt->touch();
@@ -634,7 +632,7 @@ int Builder::create_targets()
 			tgt=get_target((cwd/ *i).str());
 		if(!tgt)
 		{
-			cerr<<"I don't know anything about "<<*i<<'\n';
+			IO::print("I don't know anything about %s\n", *i);
 			return -1;
 		}
 		if(tgt==world)
@@ -643,8 +641,10 @@ int Builder::create_targets()
 	}
 
 	/* 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. */
+	and prepare world.  I don't really like this, but it keeps the graph
+	acyclic.
+	
+	XXX Could we skip preparing targets we are not interested in? */
 	if(build_world)
 		cmdline->prepare();
 	else
@@ -660,11 +660,7 @@ int Builder::create_targets()
 	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 *Builder::get_header(const FS::Path &fn)
 {
 	Target *tgt=get_target(fn.str());
 	if(tgt) return tgt;
@@ -707,8 +703,8 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
 		if(tgt)
 		{
 			Target *real_tgt=tgt;
-			if(dynamic_cast<Install *>(tgt))
-				real_tgt=real_tgt->get_depends().front();
+			if(Install *inst=dynamic_cast<Install *>(tgt))
+				real_tgt=&inst->get_source();
 
 			/* Ignore dynamic libraries from local packages unless library mode is
 			DYNAMIC */
@@ -727,19 +723,6 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
 	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];
-}
-
-/**
-This function supervises the build process, starting new actions when slots
-become available.
-*/
 int Builder::do_build()
 {
 	Target *cmdline=get_target("cmdline");
@@ -747,11 +730,11 @@ int Builder::do_build()
 	unsigned total=cmdline->count_rebuild();
 	if(!total)
 	{
-		cout<<"Already up to date\n";
+		IO::print("Already up to date\n");
 		return 0;
 	}
 	if(verbose>=1)
-		cout<<"Will build "<<total<<" target(s)\n";
+		IO::print("Will build %d target%s\n", total, (total!=1 ? "s" : ""));
 
 	vector<Action *> actions;
 
@@ -772,10 +755,7 @@ int Builder::do_build()
 					actions.push_back(action);
 
 				if(show_progress)
-				{
-					cout<<count<<" of "<<total<<" targets built\033[1G";
-					cout.flush();
-				}
+					IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
 			}
 			else if(actions.empty())
 				finish=true;
@@ -803,19 +783,15 @@ int Builder::do_build()
 	}
 
 	if(show_progress)
-		cout<<"\033[K";
+		IO::print("\033[K");
 	if(fail)
-		cout<<"Build failed\n";
+		IO::print("Build failed\n");
 	else if(show_progress)
-		cout<<"Build complete\n";
+		IO::print("Build complete\n");
 
-	return fail?1:0;
+	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
@@ -829,7 +805,7 @@ int Builder::do_clean()
 		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()==main_pkg || clean>=2))
 			clean_tgts.insert(tgt);
 
 		const TargetList &deps=tgt->get_depends();
@@ -839,41 +815,43 @@ int Builder::do_clean()
 	}
 
 	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;
-	}
+		if(FileTarget *ft=dynamic_cast<FileTarget *>(*i))
+		{
+			Action *action=new Unlink(*this, *ft);
+			while(action->check()<0) ;
+			delete action;
+		}
 
 	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();
 
-	cout<<"Required packages:\n  ";
+	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())
-			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";
+		IO::print("  %s: %s (%s)", opt.name, opt.descr, opt.value);
+		if(opt.value!=opt.defv)
+			IO::print(" [%s]", opt.defv);
+		IO::print("\n");
 	}
 }
 
 Application::RegApp<Builder> Builder::reg;
+string Builder::usagemsg;
+string Builder::helpmsg;
 
 
 Builder::Loader::Loader(Builder &b, const FS::Path &s):